php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-11-17 06:48:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

made relation names in AR case sensitive

Browse Source
This commit is contained in:
Carsten Brandt
2013-11-07 10:39:35 +01:00
parent 90839ceb5d
commit a23c54acb8
1 changed files with 7 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
framework/yii/db/ActiveRecord.php
View File

@@ -528,7 +528,7 @@ class ActiveRecord extends Model
*/ */
public function populateRelation($name, $records) public function populateRelation($name, $records)
{ {
$this->_related[strtolower($name)] = $records; $this->_related[$name] = $records;
} }
/** /**
@@ -538,23 +538,7 @@ class ActiveRecord extends Model
*/ */
public function isRelationPopulated($name) public function isRelationPopulated($name)
{ {
return array_key_exists(strtolower($name), $this->_related); return array_key_exists($name, $this->_related);
}
/**
* @return array list of populated relation names
*/
public function getPopulatedRelationNames()
{
$relations = array_keys($this->_related);
$reflection = new \ReflectionClass($this);
foreach($relations as $i => $relation) {
if ($reflection->hasMethod('get' . $relation)) {
$method = $reflection->getMethod('get' . $relation);
$relations[$i] = lcfirst(substr($method->name, 3));
}
}
return $relations;
} }
/** /**
@@ -562,12 +546,7 @@ class ActiveRecord extends Model
*/ */
public function getPopulatedRelations() public function getPopulatedRelations()
{ {
$relations = $this->getPopulatedRelationNames(); return $this->_related;
$data = [];
foreach($relations as $name) {
$data[$name] = $this->_related[strtolower($name)];
}
return $data;
} }
/** /**
@@ -1325,7 +1304,7 @@ class ActiveRecord extends Model
* *
* Note that this method requires that the primary key value is not null. * Note that this method requires that the primary key value is not null.
* *
* @param string $name the name of the relationship * @param string $name the case sensitive name of the relationship
* @param ActiveRecord $model the model to be linked with the current one. * @param ActiveRecord $model the model to be linked with the current one.
* @param array $extraColumns additional column values to be saved into the pivot table. * @param array $extraColumns additional column values to be saved into the pivot table.
* This parameter is only meaningful for a relationship involving a pivot table * This parameter is only meaningful for a relationship involving a pivot table
@@ -1347,7 +1326,7 @@ class ActiveRecord extends Model
$viaClass = $viaRelation->modelClass; $viaClass = $viaRelation->modelClass;
$viaTable = $viaClass::tableName(); $viaTable = $viaClass::tableName();
// unset $viaName so that it can be reloaded to reflect the change // unset $viaName so that it can be reloaded to reflect the change
unset($this->_related[strtolower($viaName)]); unset($this->_related[$viaName]);
} else { } else {
$viaRelation = $relation->via; $viaRelation = $relation->via;
$viaTable = reset($relation->via->from); $viaTable = reset($relation->via->from);
@@ -1403,7 +1382,7 @@ class ActiveRecord extends Model
* The model with the foreign key of the relationship will be deleted if `$delete` is true. * The model with the foreign key of the relationship will be deleted if `$delete` is true.
* Otherwise, the foreign key will be set null and the model will be saved without validation. * Otherwise, the foreign key will be set null and the model will be saved without validation.
* *
* @param string $name the name of the relationship. * @param string $name the case sensitive name of the relationship.
* @param ActiveRecord $model the model to be unlinked from the current one. * @param ActiveRecord $model the model to be unlinked from the current one.
* @param boolean $delete whether to delete the model that contains the foreign key. * @param boolean $delete whether to delete the model that contains the foreign key.
* If false, the model's foreign key will be set null and saved. * If false, the model's foreign key will be set null and saved.
@@ -1421,7 +1400,7 @@ class ActiveRecord extends Model
/** @var $viaClass ActiveRecord */ /** @var $viaClass ActiveRecord */
$viaClass = $viaRelation->modelClass; $viaClass = $viaRelation->modelClass;
$viaTable = $viaClass::tableName(); $viaTable = $viaClass::tableName();
unset($this->_related[strtolower($viaName)]); unset($this->_related[$viaName]);
} else { } else {
$viaRelation = $relation->via; $viaRelation = $relation->via;
$viaTable = reset($relation->via->from); $viaTable = reset($relation->via->from);