RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-03-22 16:03:49 +03:00
Code Issues Projects Releases Wiki Activity

Fixed #969.

Browse Source
This commit is contained in:
romanb 2008-04-17 11:07:00 +00:00
parent 0370cedc08
commit 274be06c1b
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/Doctrine/Hydrator.php
View File

@ -38,8 +38,7 @@ class Doctrine_Hydrator extends Doctrine_Hydrator_Abstract
* hydrateResultSet
* parses the data returned by statement object
*
* This is method defines the core of Doctrine's object population algorithm
* hence this method strives to be as fast as possible
* This is method defines the core of Doctrine's object population algorithm.
*
* The key idea is the loop over the rowset only once doing all the needed operations
* within this massive loop.
@ -88,7 +87,8 @@ class Doctrine_Hydrator extends Doctrine_Hydrator_Abstract
$isSimpleQuery = count($this->_queryComponents) <= 1;
// Holds hydration listeners that get called during hydration
$listeners = array();
// Lookup map to quickly discover/lookup existing records in the result
// Lookup map to quickly discover/lookup existing records in the result
// It's the identifier "memory"
$identifierMap = array();
// Holds for each component the last previously seen element in the result set
$prev = array();
@ -230,7 +230,7 @@ class Doctrine_Hydrator extends Doctrine_Hydrator_Abstract
$oneToOne = true;
if ( ! isset($nonemptyComponents[$dqlAlias])) {
$prev[$parent][$relationAlias] = $driver->getNullPointer();
} else {
} else if ( ! isset($prev[$parent][$relationAlias])) {
$element = $driver->getElement($data, $componentName);
$prev[$parent][$relationAlias] = $element;
}

1
lib/Doctrine/Record.php
View File

@ -531,6 +531,7 @@ abstract class Doctrine_Record extends Doctrine_Access implements Countable, Ite
*
* @param array $data
* @return boolean
* @todo ActiveRecord method
*/
public function hydrate(array $data)
{