RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-01-20 23:41:39 +03:00
Code Issues Projects Releases Wiki Activity

Browse Source
This commit is contained in:
zYne 2007-09-06 20:52:16 +00:00
parent 4eac440c56
commit e45ae7d082
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/Doctrine/Hydrate.php
View File

@ -1024,6 +1024,7 @@ class Doctrine_Hydrate extends Doctrine_Object implements Serializable
} }
} }
// dealing with root component // dealing with root component
$table = $this->_aliasMap[$rootAlias]['table']; $table = $this->_aliasMap[$rootAlias]['table'];
$componentName = $table->getComponentName(); $componentName = $table->getComponentName();
@ -1032,9 +1033,10 @@ class Doctrine_Hydrate extends Doctrine_Object implements Serializable
$oneToOne = false; $oneToOne = false;
$index = $driver->search($element, $array); $index = $driver->search($element, $array);
if ($index === false) { if ($index === false) {
if (isset($map['map'])) { if (isset($this->_aliasMap[$rootAlias]['map'])) {
$key = $map['map']; $key = $this->_aliasMap[$rootAlias]['map'];
if (isset($array[$key])) { if (isset($array[$key])) {
throw new Doctrine_Hydrate_Exception("Couldn't hydrate. Found non-unique key mapping."); throw new Doctrine_Hydrate_Exception("Couldn't hydrate. Found non-unique key mapping.");
} }
@ -1042,6 +1044,7 @@ class Doctrine_Hydrate extends Doctrine_Object implements Serializable
if ( ! isset($element[$key])) { if ( ! isset($element[$key])) {
throw new Doctrine_Hydrate_Exception("Couldn't hydrate. Found a non-existent key."); throw new Doctrine_Hydrate_Exception("Couldn't hydrate. Found a non-existent key.");
} }
$array[$element[$key]] = $element; $array[$element[$key]] = $element;
} else { } else {
$array[] = $element; $array[] = $element;