Changeset 4336

Timestamp:

05/06/08 10:20:42 (8 months ago)

Author:

romanb

Message:

Object hydration now properly initializes collections.

Location:

branches/0.11

Files:

• lib/Doctrine/Hydrator.php (modified) (1 diff)
• lib/Doctrine/Hydrator/RecordDriver.php (modified) (3 diffs)
• lib/Doctrine/Record.php (modified) (1 diff)
• tests/Hydrate/CollectionInitializationTestCase.php (added)
• tests/Query/LimitTestCase.php (modified) (3 diffs)
• tests/Record/SynchronizeTestCase.php (modified) (2 diffs)
• tests/run.php (modified) (1 diff)

branches/0.11/lib/Doctrine/Hydrator.php

@@ -108 +108 @@
             $listeners[$componentName] = $data['table']->getRecordListener();
             $identifierMap[$dqlAlias] = array();
-            $prev[$dqlAlias] = array();
+            $prev[$dqlAlias] = null;
             $idTemplate[$dqlAlias] = '';
         }

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

@@ -37 +37 @@
     protected $_collections = array();
     protected $_tables = array();
+    private $_initializedRelations = array();
 
     public function getElementCollection($component)
@@ -55 +56 @@
     public function initRelated($record, $name)
     {
+        if ( ! isset($this->_initializedRelations[$record->getOid()][$name])) {
+            $relation = $record->getTable()->getRelation($name);
+            $coll = new Doctrine_Collection($relation->getTable()->getComponentName());
+            $coll->setReference($record, $relation);
+            $record[$name] = $coll;
+            $this->_initializedRelations[$record->getOid()][$name] = true;
+        }
         return true;
-        /*
-        if ( ! is_array($record)) {
-            $record[$name];
-            return true;
-        }
-        return false;
-        */
     }
     
@@ -125 +126 @@
             $table->setAttribute(Doctrine::ATTR_LOAD_REFERENCES, true);
         }
+        $this->_initializedRelations = null;
+        $this->_collections = null;
+        $this->_tables = null;
     }
     

branches/0.11/lib/Doctrine/Record.php

@@ -950 +950 @@
 
         // one-to-many or one-to-one relation
-        if ($rel instanceof Doctrine_Relation_ForeignKey ||
-            $rel instanceof Doctrine_Relation_LocalKey) {
+        if ($rel instanceof Doctrine_Relation_ForeignKey || $rel instanceof Doctrine_Relation_LocalKey) {
             if ( ! $rel->isOneToOne()) {
                 // one-to-many relation found

branches/0.11/tests/Query/LimitTestCase.php

@@ -206 +206 @@
         $q = new Doctrine_Query();
         $q->from('User.Group')->limit(5);
-
+        
         $users = $q->execute();
 
@@ -212 +212 @@
         
         $user = $this->objTable->find(5);
+        
         $user->Group[1]->name = "Tough guys inc.";
+        
         $user->Group[2]->name = "Terminators";
         
@@ -225 +227 @@
 
         $this->connection->flush();
-
+        
         $this->assertEqual($user->Group[0]->name, "Action Actors");
         $this->assertEqual(count($user->Group), 3);
-
-
-
-        $q = new Doctrine_Query();
-        $q->from("User")->where("User.Group.id = ?")->orderby("User.id ASC")->limit(5);
-
-
+        
+        $q = new Doctrine_Query();
+        $q->from("User")->where("User.Group.id = ?")->orderby("User.id ASC")->limit(5);       
+             
         $users = $q->execute(array($user->Group[1]->id));
-
+        
         $this->assertEqual($users->count(), 3);
-
+        
         $this->connection->clear();
         $q = new Doctrine_Query();

branches/0.11/tests/Record/SynchronizeTestCase.php

@@ -87 +87 @@
         $userArray['Phonenumber'][] = array('phonenumber' => '333 238');
 
+
         $user->synchronizeWithArray($userArray);
+        
         $this->assertEqual($user->Phonenumber->count(), 2);
         $this->assertEqual($user->Phonenumber[1]->phonenumber, '333 238');
@@ -96 +98 @@
     {
         $user = Doctrine_Query::create()->from('User u, u.Email, u.Phonenumber')->fetchOne();
+        
         $this->assertEqual($user->Phonenumber->count(), 2);
         $this->assertEqual($user->Phonenumber[1]->phonenumber, '333 238');

branches/0.11/tests/run.php

@@ -169 +169 @@
 $core->addTestCase(new Doctrine_Collection_Snapshot_TestCase());
 $core->addTestCase(new Doctrine_Hydrate_FetchMode_TestCase());
+$core->addTestCase(new Doctrine_Hydrate_CollectionInitialization_TestCase());
 $core->addTestCase(new Doctrine_Tokenizer_TestCase());
 $core->addTestCase(new Doctrine_BatchIterator_TestCase());