Doctrine

Timestamp:

09/08/08 19:48:10 (10 months ago)

Author:

romanb

Message:

Fixed #1323. Final adjustments to come from jon.

Location:

branches/1.0

Files:

• lib/Doctrine/Collection.php (modified) (2 diffs)
• lib/Doctrine/Connection/UnitOfWork.php (modified) (1 diff)
• lib/Doctrine/Relation.php (modified) (1 diff)
• lib/Doctrine/Relation/Nest.php (modified) (3 diffs)
• lib/Doctrine/Relation/Parser.php (modified) (5 diffs)
• tests/Query/LimitTestCase.php (modified) (2 diffs)
• tests/Relation/ManyToManyTestCase.php (modified) (1 diff)
• tests/run.php (modified) (1 diff)
• tests/Ticket/1323b2TestCase.php (added)
• tests/Ticket/1323TestCase.php (added)

branches/1.0/lib/Doctrine/Collection.php

@@ -264 +264 @@
 
         if ($relation instanceof Doctrine_Relation_ForeignKey || 
-            $relation instanceof Doctrine_Relation_LocalKey) {
-
+                $relation instanceof Doctrine_Relation_LocalKey) {
             $this->referenceField = $relation->getForeignFieldName();
 
@@ -442 +441 @@
         if (isset($this->referenceField)) {
             $value = $this->reference->get($this->relation->getLocalFieldName());
-
             if ($value !== null) {
                 $record->set($this->referenceField, $value, false);

branches/1.0/lib/Doctrine/Connection/UnitOfWork.php

@@ -445 +445 @@
                     $this->saveGraph($assocRecord);
                 }
+                // take snapshot of collection state, so that we know when its modified again
+                $v->takeSnapshot();
             }
         }

branches/1.0/lib/Doctrine/Relation.php

@@ -67 +67 @@
                                   'cascade'     => array(), // application-level cascades
                                   'owningSide'  => false, // whether this is the owning side
+                                  'refClassRelation' => null,
                                   );
 

branches/1.0/lib/Doctrine/Relation/Nest.php

@@ -39 +39 @@
      * @return string
      */
-    public function getRelationDql($count, $context = 'record')
+    /*public function getRelationDql($count, $context = 'record')
     {
         switch ($context) {
@@ -73 +73 @@
 
         return $dql;
-    }
-
-    /**
-    public function fetchRelatedFor(Doctrine_Record $record)
-    {
-        $id = $record->getIncremented();
-
-        if (empty($id) || ! $this->definition['table']->getAttribute(Doctrine::ATTR_LOAD_REFERENCES)) {
-            return new Doctrine_Collection($this->getTable());
-        } else {
-            $q = new Doctrine_Query();
-            
-            $c  = $this->getTable()->getComponentName();
-            $a  = substr($c, 0, 1);
-            $c2 = $this->getAssociationTable()->getComponentName();
-            $a2 = substr($c2, 0, 1);
-
-            $q->from($c)
-              ->innerJoin($c . '.' . $c2)
-
-            $sub = 'SELECT ' . $this->getForeign() 
-                 . ' FROM '  . $c2
-                 . ' WHERE ' . $this->getLocal() 
-                 . ' = ?';
-        }
-    }
-    */
+    }*/
 
     public function fetchRelatedFor(Doctrine_Record $record)
     {
         $id = $record->getIncremented();
-
 
         if (empty($id) || ! $this->definition['table']->getAttribute(Doctrine::ATTR_LOAD_REFERENCES)) {
@@ -137 +110 @@
               ->where(implode(' OR ', $condition));
             $q->addComponent($tableName,  $record->getTable()->getComponentName());
-            $q->addComponent($assocTable, $record->getTable()->getComponentName(). '.' . $this->getAssociationFactory()->getComponentName());
+            
+            $path = $record->getTable()->getComponentName(). '.' . $this->getAssociationFactory()->getComponentName();
+            if ($this->definition['refClassRelation']) {
+                $path = $record->getTable()->getComponentName(). '.' . $this->definition['refClassRelation'];
+            }
+            $q->addComponent($assocTable, $path);
 
             $params = ($this->definition['equal']) ? array($id, $id) : array($id);
+            $res = $q->execute($params);
 
-            return $q->execute($params);
+            return $res;
         }
     }

branches/1.0/lib/Doctrine/Relation/Parser.php

@@ -156 +156 @@
             return $this->_relations[$alias];
         }
-
+       
         if (isset($this->_pending[$alias])) {
             $def = $this->_pending[$alias];
             $identifierColumnNames = $this->_table->getIdentifierColumnNames();
             $idColumnName = array_pop($identifierColumnNames);
-        
+            
             // check if reference class name exists
             // if it does we are dealing with association relation
@@ -167 +167 @@
                 $def = $this->completeAssocDefinition($def);
                 $localClasses = array_merge($this->_table->getOption('parents'), array($this->_table->getComponentName()));
-
-                if ( ! isset($this->_pending[$def['refClass']]) && 
-                     ! isset($this->_relations[$def['refClass']])) {
+                
+                $backRefRelationName = isset($def['refClassRelation']) ?
+                        $def['refClassRelation'] : $def['refClass'];
+                if ( ! isset($this->_pending[$backRefRelationName]) && ! isset($this->_relations[$backRefRelationName])) {
 
                     $parser = $def['refTable']->getRelationParser();
+                    
                     if ( ! $parser->hasRelation($this->_table->getComponentName())) {
                         $parser->bind($this->_table->getComponentName(),
@@ -181 +183 @@
                     }
 
-                    if ( ! $this->hasRelation($def['refClass'])) {
-                        $this->bind($def['refClass'], array('type' => Doctrine_Relation::MANY,
-                                                            'foreign' => $def['local'],
-                                                            'local'   => $idColumnName));
+                    if ( ! $this->hasRelation($backRefRelationName)) {
+                        if (in_array($def['class'], $localClasses)) {
+                            $this->bind($def['refClass'] . " as " . $backRefRelationName, array(
+                                    'type' => Doctrine_Relation::MANY,
+                                    'foreign' => $def['foreign'],
+                                    'local'   => $idColumnName));
+                        } else {
+                            $this->bind($def['refClass'] . " as " . $backRefRelationName, array(
+                                    'type' => Doctrine_Relation::MANY,
+                                    'foreign' => $def['local'],
+                                    'local'   => $idColumnName));
+                        }
                     }
                 }
@@ -213 +223 @@
                 // unset pending relation
                 unset($this->_pending[$alias]);
-
                 $this->_relations[$alias] = $rel;
                 return $rel;
@@ -293 +302 @@
                 // foreign key not set
                 // try to guess the foreign key
-
                 $def['local'] = ($def['foreign'] === $id[0]) ? $id[1] : $id[0];
             }

branches/1.0/tests/Query/LimitTestCase.php

@@ -242 +242 @@
         
         $user2 = $this->objTable->find(4);
-        $user2->Group = $user->Group;
+        //$user2->Group = $user->Group;
+        $user2->Group = new Doctrine_Collection('Group');
+        $user2->Group[] = $user->Group[0];
+        $user2->Group[] = $user->Group[1];
+        $user2->Group[] = $user->Group[2];
         
         $user3 = $this->objTable->find(6);
-        $user3->Group = $user->Group;
+        //$user3->Group = $user->Group;
+        $user3->Group = new Doctrine_Collection('Group');
+        $user3->Group[] = $user->Group[0];
+        $user3->Group[] = $user->Group[1];
+        $user3->Group[] = $user->Group[2];
 
         $this->assertEqual($user->Group[0]->name, "Action Actors");
         $this->assertEqual(count($user->Group), 3);
+        $this->assertEqual(count($user2->Group), 3);
+        $this->assertEqual(count($user3->Group), 3);
 
         $this->connection->flush();
@@ -256 +266 @@
         
         $q = new Doctrine_Query();
-        $q->from("User")->where("User.Group.id = ?")->orderby("User.id ASC")->limit(5);       
-             
+        $q->from("User")->where("User.Group.id = ?")->orderby("User.id ASC")->limit(5);
+        
         $users = $q->execute(array($user->Group[1]->id));
         

branches/1.0/tests/Relation/ManyToManyTestCase.php

@@ -36 +36 @@
             $this->pass();
         } catch(Doctrine_Exception $e) {
+            echo $e->getMessage();
             $this->fail();
         }

branches/1.0/tests/run.php

@@ -120 +120 @@
 $tickets->addTestCase(new Doctrine_Ticket_1304_TestCase());
 $tickets->addTestCase(new Doctrine_Ticket_1305_TestCase());
+$tickets->addTestCase(new Doctrine_Ticket_1323_TestCase());
+$tickets->addTestCase(new Doctrine_Ticket_1323b2_TestCase());
 $tickets->addTestCase(new Doctrine_Ticket_1325_TestCase());
 $tickets->addTestCase(new Doctrine_Ticket_1326_TestCase());