From 274be06c1bb1fdb5ce8cf3c30f4e511957270703 Mon Sep 17 00:00:00 2001
From: romanb <romanb@625475ce-881a-0410-a577-b389adb331d8>
Date: Thu, 17 Apr 2008 11:07:00 +0000
Subject: [PATCH] Fixed #969.

---
 lib/Doctrine/Hydrator.php | 8 ++++----
 lib/Doctrine/Record.php   | 1 +
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/lib/Doctrine/Hydrator.php b/lib/Doctrine/Hydrator.php
index 7b3e774fe..5ebf3b28d 100644
--- a/lib/Doctrine/Hydrator.php
+++ b/lib/Doctrine/Hydrator.php
@@ -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;
                     }
diff --git a/lib/Doctrine/Record.php b/lib/Doctrine/Record.php
index 9f6fb0774..719e63620 100644
--- a/lib/Doctrine/Record.php
+++ b/lib/Doctrine/Record.php
@@ -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)
     {