RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-01-19 06:51:40 +03:00
Code Issues Projects Releases Wiki Activity

Make Doctrine_Collection objects use Doctrine::ATTR_COLL_KEY for data array keys

Browse Source
This commit is contained in:
adamthehutt 2007-12-30 20:43:31 +00:00
parent 716bcedd76
commit 0b78afa97d
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/Doctrine/Collection.php
View File

@ -91,6 +91,10 @@ class Doctrine_Collection extends Doctrine_Access implements Countable, Iterator
$keyColumn = $table->getBoundQueryPart('indexBy'); $keyColumn = $table->getBoundQueryPart('indexBy');
} }
if ($keyColumn === null) {
$keyColumn = $table->getAttribute(Doctrine::ATTR_COLL_KEY);
}
if ($keyColumn !== null) { if ($keyColumn !== null) {
$this->keyColumn = $keyColumn; $this->keyColumn = $keyColumn;
} }

4
lib/Doctrine/Configurable.php
View File

@ -97,8 +97,8 @@ abstract class Doctrine_Configurable extends Doctrine_Locator_Injectable
if ( ! ($this instanceof Doctrine_Table)) { if ( ! ($this instanceof Doctrine_Table)) {
throw new Doctrine_Exception("This attribute can only be set at table level."); throw new Doctrine_Exception("This attribute can only be set at table level.");
} }
if ($value !== null && ! $this->hasColumn($value)) { if ($value !== null && ! $this->hasField($value)) {
throw new Doctrine_Exception("Couldn't set collection key attribute. No such column '$value'"); throw new Doctrine_Exception("Couldn't set collection key attribute. No such field '$value'");
} }
break; break;
case Doctrine::ATTR_CACHE: case Doctrine::ATTR_CACHE: