Doctrine

Timestamp:

03/05/08 11:20:40 (16 months ago)

Author:

romanb

Message:

Fixed #786.

Location:

branches/0.10

Files:

• lib/Doctrine/Hydrator/RecordDriver.php (modified) (5 diffs)
• lib/Doctrine/Record.php (modified) (1 diff)
• tests/RecordTestCase.php (modified) (2 diffs)
• tests/Ticket/428TestCase.php (modified) (2 diffs)

branches/0.10/lib/Doctrine/Hydrator/RecordDriver.php

@@ -21 +21 @@
 
 /**
- * Doctrine_Hydrate_Record 
- * defines a record fetching strategy for Doctrine_Hydrate
+ * Doctrine_Hydrate_RecordDriver
+ * Hydration strategy used for creating collections of entity objects.
  *
  * @package     Doctrine
@@ -31 +31 @@
  * @version     $Revision$
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @author      Roman Borschel <roman@code-factory.org>
  */
 class Doctrine_Hydrator_RecordDriver extends Doctrine_Locator_Injectable
 {
     protected $_collections = array();
-    
-    protected $_records = array();
-    
     protected $_tables = array();
 
@@ -81 +79 @@
      * @return boolean
      */
-    public function isIdentifiable(array $row, Doctrine_Table $table)
+    /*public function isIdentifiable(array $row, Doctrine_Table $table)
     {
         $primaryKeys = $table->getIdentifierColumnNames();
@@ -97 +95 @@
         }
         return true;
-    }
+    }*/
     
     public function getNullPointer() 
@@ -114 +112 @@
         $record = $this->_tables[$component]->getRecord();
 
-        if ( ! isset($this->_records[$record->getOid()]) ) {
-            $record->clearRelated();
-            $this->_records[$record->getOid()] = $record;
-        }
-
         return $record;
     }

branches/0.10/lib/Doctrine/Record.php

@@ -679 +679 @@
             }
             $query->where(implode(' = ? AND ', $this->getTable()->getIdentifierColumnNames()) . ' = ?');
+            $this->clearRelated();
             $record = $query->fetchOne($id);
         } else {

branches/0.10/tests/RecordTestCase.php

@@ -766 +766 @@
         $user = $this->objTable->find(5);
         $this->assertEqual($user->Group->count(), 3);
-        $this->assertEqual($user->Group[1]->id, 2);
-        $this->assertEqual($user->Group[2]->id, 3);
+        $this->assertEqual($user->Group[1]->id, 1);
+        $this->assertEqual($user->Group[2]->id, 2);
 
         $user->unlink('Group', array($group1->id, $group2->id));
@@ -792 +792 @@
         $user = $this->objTable->find(5);
         $this->assertEqual($user->Group->count(), 2);
-        $this->assertEqual($user->Group[0]->identifier(), $group1->identifier());
-        $this->assertEqual($user->Group[1]->identifier(), $group2->identifier());
+        $this->assertEqual($user->Group[0]->identifier(), $group2->identifier());
+        $this->assertEqual($user->Group[1]->identifier(), $group1->identifier());
 
         $user->unlink('Group');
         $user->save();
-        unset($user);
+        $user->free();
 
         $user = $this->objTable->find(5);

branches/0.10/tests/Ticket/428TestCase.php

@@ -14 +14 @@
 class Doctrine_Ticket_428_TestCase extends Doctrine_UnitTestCase
 {
+    private $_albums;
+    
     public function prepareData()
     {
@@ -31 +33 @@
         $albums->save();
         $this->assertEqual(count($albums[0]->Song), 4);
+        $this->_albums = $albums;
     }
 
     public function testAggregateValueMappingSupportsLeftJoins() 
     {
+        foreach ($this->_albums as $album) {
+            $album->clearRelated();
+        }
+        
         $q = new Doctrine_Query();