deon/phptsmadmin
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Upstream Patch: ORM enhancements for PTA

Browse Source
This commit is contained in:
Deon George 2011-05-23 20:02:00 +10:00
parent ff2370c368
commit 4765770a1a
1 changed files with 73 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

97
includes/kohana/modules/orm/classes/kohana/orm.php
View File

@ -235,6 +235,15 @@ class Kohana_ORM extends Model implements serializable {
*/ */
protected $_table_names_plural = TRUE; protected $_table_names_plural = TRUE;
// Suppress ORMs inclusion of <table_name>.*
protected $_disable_wild_select = FALSE;
// Suppress ORMs inclusion of <table_name>. to column joins
protected $_disable_join_table_name = FALSE;
// Suppress ORMs use of limit
protected $_disable_limit = FALSE;
/** /**
* Model configuration, reload on wakeup? * Model configuration, reload on wakeup?
* @var bool * @var bool
@ -368,6 +377,7 @@ class Kohana_ORM extends Model implements serializable {
{ {
$defaults['model'] = $alias; $defaults['model'] = $alias;
$defaults['foreign_key'] = $this->_object_name.$this->_foreign_key_suffix; $defaults['foreign_key'] = $this->_object_name.$this->_foreign_key_suffix;
$defaults['far_key'] = Inflector::singular($alias).$this->_foreign_key_suffix;
$this->_has_one[$alias] = array_merge($defaults, $details); $this->_has_one[$alias] = array_merge($defaults, $details);
} }
@ -630,7 +640,7 @@ class Kohana_ORM extends Model implements serializable {
$model = $this->_related($column); $model = $this->_related($column);
// Use this model's column and foreign model's primary key // Use this model's column and foreign model's primary key
$col = $model->_table_name.'.'.$model->_primary_key; $col = ($this->_disable_join_table_name ? '' : $model->_table_name.'.').$model->_primary_key;
$val = $this->_object[$this->_belongs_to[$column]['foreign_key']]; $val = $this->_object[$this->_belongs_to[$column]['foreign_key']];
$model->where($col, '=', $val)->find(); $model->where($col, '=', $val)->find();
@ -641,9 +651,23 @@ class Kohana_ORM extends Model implements serializable {
{ {
$model = $this->_related($column); $model = $this->_related($column);
// Use this model's primary key value and foreign model's column if (! is_array($this->_has_one[$column]['foreign_key']))
$col = $model->_table_name.'.'.$this->_has_one[$column]['foreign_key']; {
$val = $this->pk(); // Use this model's primary key value and foreign model's column
$col = ($this->_disable_join_table_name ? '' : $model->_table_name.'.').$this->_has_one[$column]['foreign_key'];
$val = $this->_object[$this->_has_one[$column]['far_key']];
}
else
{
foreach ($this->_has_one[$column]['foreign_key'] as $fk)
{
// Simple has_many relationship, search where target model's foreign key is this model's primary key
$col = ($this->_disable_join_table_name ? '' : $model->_table_name.'.').$fk;
$val = $this->_object[$fk];
$model = $model->where($col, '=', $val);
}
}
$model->where($col, '=', $val)->find(); $model->where($col, '=', $val)->find();
@ -653,29 +677,52 @@ class Kohana_ORM extends Model implements serializable {
{ {
$model = ORM::factory($this->_has_many[$column]['model']); $model = ORM::factory($this->_has_many[$column]['model']);
if (isset($this->_has_many[$column]['through'])) if (! is_array($this->_has_many[$column]['foreign_key']))
{ {
// Grab has_many "through" relationship table if (isset($this->_has_many[$column]['through']))
$through = $this->_has_many[$column]['through']; {
// Grab has_many "through" relationship table
$through = $this->_has_many[$column]['through'];
// Join on through model's target foreign key (far_key) and target model's primary key // Join on through model's target foreign key (far_key) and target model's primary key
$join_col1 = $through.'.'.$this->_has_many[$column]['far_key']; $join_col1 = ($this->_disable_join_table_name ? '' : $through.'.').$this->_has_many[$column]['far_key'];
$join_col2 = $model->_table_name.'.'.$model->_primary_key; $join_col2 = ($this->_disable_join_table_name ? '' : $model->_table_name.'.').$model->_primary_key;
$model->join($through)->on($join_col1, '=', $join_col2); $model->join($through)->on($join_col1, '=', $join_col2);
// Through table's source foreign key (foreign_key) should be this model's primary key // Through table's source foreign key (foreign_key) should be this model's primary key
$col = $through.'.'.$this->_has_many[$column]['foreign_key']; $col = ($this->_disable_join_table_name ? '' : $through.'.').$this->_has_many[$column]['foreign_key'];
$val = $this->pk(); $val = $this->pk();
}
else
{
// Simple has_many relationship, search where target model's foreign key is this model's primary key
$col = ($this->_disable_join_table_name ? '' : $model->_table_name.'.').$this->_has_many[$column]['foreign_key'];
$val = $this->_object[$this->_has_many[$column]['far_key']];
}
return $model->where($col, '=', $val);
} }
else else
{ {
// Simple has_many relationship, search where target model's foreign key is this model's primary key foreach ($this->_has_many[$column]['foreign_key'] as $fk)
$col = $model->_table_name.'.'.$this->_has_many[$column]['foreign_key']; {
$val = $this->pk(); if (isset($this->_has_many[$column]['through']))
} {
throw new Kohana_Exception('This code hasnt been written yet!');
}
else
{
// Simple has_many relationship, search where target model's foreign key is this model's primary key
$col = ($this->_disable_join_table_name ? '' : $model->_table_name.'.').$fk;
$val = $this->_object[$fk];
}
return $model->where($col, '=', $val); $model = $model->where($col, '=', $val);
}
return $model;
}
} }
else else
{ {
@ -999,14 +1046,15 @@ class Kohana_ORM extends Model implements serializable {
{ {
$this->_db_builder->from($this->_table_name); $this->_db_builder->from($this->_table_name);
if ($multiple === FALSE) if ($multiple === FALSE AND ! $this->_disable_limit)
{ {
// Only fetch 1 record // Only fetch 1 record
$this->_db_builder->limit(1); $this->_db_builder->limit(1);
} }
// Select all columns by default // Select all columns by default
$this->_db_builder->select($this->_table_name.'.*'); if (! $this->_disable_wild_select)
$this->_db_builder->select($this->_table_name.'.*');
if ( ! isset($this->_db_applied['order_by']) AND ! empty($this->_sorting)) if ( ! isset($this->_db_applied['order_by']) AND ! empty($this->_sorting))
{ {
@ -1015,7 +1063,7 @@ class Kohana_ORM extends Model implements serializable {
if (strpos($column, '.') === FALSE) if (strpos($column, '.') === FALSE)
{ {
// Sorting column for use in JOINs // Sorting column for use in JOINs
$column = $this->_table_name.'.'.$column; $column = ($this->_disable_join_table_name ? '' : $this->_table_name.'.').$column;
} }
$this->_db_builder->order_by($column, $direction); $this->_db_builder->order_by($column, $direction);
@ -1127,9 +1175,10 @@ class Kohana_ORM extends Model implements serializable {
* @param string $value The value to filter * @param string $value The value to filter
* @return string * @return string
*/ */
protected function run_filter($field, $value) protected function run_filter($field, $value, $filters=NULL)
{ {
$filters = $this->filters(); if (is_null($filters))
$filters = $this->filters();
// Get the filters for this column // Get the filters for this column
$wildcards = empty($filters[TRUE]) ? array() : $filters[TRUE]; $wildcards = empty($filters[TRUE]) ? array() : $filters[TRUE];