Changeset 5019

Timestamp:

10/02/08 00:06:24 (3 months ago)

Author:

jwage

Message:

[1.1] fixes #1409 fixes #1436 Fixed unlink() and link() to not delete relationships by default until record is saved

Location:

branches/1.1

Files:

• lib/Doctrine/Connection/UnitOfWork.php (modified) (1 diff)
• lib/Doctrine/Record.php (modified) (10 diffs)
• tests/RecordTestCase.php (modified) (3 diffs)
• tests/RelationTestCase.php (modified) (2 diffs)
• tests/Ticket/1436TestCase.php (modified) (2 diffs)

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

@@ -92 +92 @@
                     $pendingDelete->delete();
                 }
+                
+                foreach ($record->getPendingUnlinks() as $alias => $ids) {
+                    if ( ! $ids) {
+                        $record->unlinkInDb($alias, array());
+                    } else {
+                        $record->unlinkInDb($alias, array_keys($ids));
+                    }
+                }
+                $record->resetPendingUnlinks();
 
                 $record->getTable()->getRecordListener()->postSave($event);

branches/1.1/lib/Doctrine/Record.php

@@ -137 +137 @@
      */
     protected $_pendingDeletes = array();
+    
+    /**
+     * Array of pending un links in format alias => keys to be executed after save
+     *
+     * @var array $_pendingUnlinks
+     */
+    protected $_pendingUnlinks = array();
 
     /**
@@ -1215 +1222 @@
     {
         return $this->_pendingDeletes;
+    }
+
+    /**
+     * Get pending un links array
+     *
+     * @return array $pendingUnlinks
+     */
+    public function getPendingUnlinks()
+    {
+        return $this->_pendingUnlinks;
+    }
+
+    /**
+     * Reset pending un links array
+     *
+     * @return void
+     */
+    public function resetPendingUnlinks()
+    {
+        $this->_pendingUnlinks = array();
     }
 
@@ -1481 +1508 @@
             if ($key == '_identifier') {
                 $refresh = true;
-                $this->assignIdentifier((array) $value);
+                $this->assignIdentifier($value);
                 continue;
             }
@@ -1513 +1540 @@
             if ($key == '_identifier') {
                 $refresh = true;
-                $this->assignIdentifier((array) $value);
+                $this->assignIdentifier($value);
                 continue;
             }
 
             if ($deep && $this->getTable()->hasRelation($key)) {
-                $this->get($key)->synchronizeWithArray($value);
+                if (isset($value['_identifiers']) && is_array($value['_identifiers'])) {
+                    $this->unlink($key, array(), false);
+                    foreach ($value['_identifiers'] as $id => $exists) {
+                        if ($exists) {
+                            $this->link($key, $id, false);
+                        }
+                    }
+                } else {
+                    $this->$key->synchronizeWithArray($value);
+                }
             } else if ($this->getTable()->hasField($key)) {
                 $this->set($key, $value);
@@ -1525 +1561 @@
 
         // eliminate relationships missing in the $array
-        foreach ($this->_references as $name => $obj) {
+        foreach ($this->_references as $name => $relation) {
+            
             if ( ! isset($array[$name])) {
                 unset($this->$name);
@@ -1872 +1909 @@
      * @param string $alias     related component alias
      * @param array $ids        the identifiers of the related records
+     * @param boolean $now      wether or not to execute now or set pending
      * @return Doctrine_Record  this object
      */
-    public function unlink($alias, $ids = array())
+    public function unlink($alias, $ids = array(), $now = false)
     {
         $ids = (array) $ids;
 
+        if (isset($this->_references[$alias])) {
+            foreach ($this->_references[$alias] as $k => $record) {
+                if (in_array(current($record->identifier()), $ids) || empty($ids)) {
+                    $this->_references[$alias]->remove($k);
+                }
+            }
+            $this->_references[$alias]->takeSnapshot();
+        }
+        if (!$this->exists() || $now === false) {
+            if (count($ids)) {
+                foreach ($ids as $id) {
+                    $this->_pendingUnlinks[$alias][$id] = true;
+                }
+            } else {
+                $this->_pendingUnlinks[$alias] = false;
+            }
+            return $this;
+        } else {
+            return $this->unlinkInDb($alias, $ids);
+        }
+    }
+
+    public function unlinkInDb($alias, $ids = array())
+    {
         $q = new Doctrine_Query();
-
         $rel = $this->getTable()->getRelation($alias);
 
@@ -1904 +1965 @@
             $q->execute();
         }
-        if (isset($this->_references[$alias])) {
-            foreach ($this->_references[$alias] as $k => $record) {
-                if (in_array(current($record->identifier()), $ids)) {
-                    $this->_references[$alias]->remove($k);
-                }
-            }
-            $this->_references[$alias]->takeSnapshot();
-        }
         return $this;
     }
@@ -1921 +1974 @@
      * @param string $alias     related component alias
      * @param array $ids        the identifiers of the related records
+     * @param boolean $now      wether or not to execute now or set pending
      * @return Doctrine_Record  this object
      */
-    public function link($alias, $ids)
+    public function link($alias, $ids, $now = false)
     {
         $ids = (array) $ids;
@@ -1930 +1984 @@
             return $this;
         }
-
+        if (!$this->exists() || $now === false) {
+            $relTable = $this->getTable()->getRelation($alias)->getTable();
+            $records = $relTable->createQuery()
+                ->whereIn($relTable->getIdentifier(), $ids)
+                ->execute();
+            foreach ($records as $record) {
+                $this->$alias->add($record);
+            }
+            foreach ($ids as $id) {
+                if (isset($this->_pendingUnlinks[$alias][$id])) {
+                    unset($this->_pendingUnlinks[$alias][$id]);
+                }
+            }
+            return $this;
+        } else {
+            return $this->linkInDb($alias, $ids);
+        }
+    }
+
+    public function linkInDb($alias, $ids)
+    {
         $identifier = array_values($this->identifier());
         $identifier = array_shift($identifier);
@@ -1983 +2057 @@
 
             $q->execute();
-
         }
 
         return $this;
     }
-
 
     /**

branches/1.1/tests/RecordTestCase.php

@@ -798 +798 @@
         $this->assertEqual($user->Group[2]->id, 2);
 
-        $user->unlink('Group', array($group1->id, $group2->id));
+        $user->unlink('Group', array($group1->id, $group2->id), true);
         $this->assertEqual($user->Group->count(), 1);
 
@@ -814 +814 @@
 
         // REPLACING OLD ASSOCIATED REFERENCE
-        $user->unlink('Group', 3);  // you MUST first unlink old relationship
+        $user->unlink('Group', 3, true);  // you MUST first unlink old relationship
         $user->Group[1] = $group1;
         $user->Group[0] = $group2;
@@ -824 +824 @@
         $this->assertEqual($user->Group[1]->identifier(), $group1->identifier());
 
-        $user->unlink('Group');
+        $user->unlink('Group', array(), true);
         $user->save();
         $user->free();

branches/1.1/tests/RelationTestCase.php

@@ -68 +68 @@
         $this->assertEqual($user->Group->count(), 3);
         
-        $user->unlink('Group', array(2, 3, 4));
+        $user->unlink('Group', array(2, 3, 4), true);
         
         $this->assertEqual($user->Group->count(), 0);
@@ -93 +93 @@
         $this->assertEqual($user->Phonenumber->count(), 3);
         
-        $user->unlink('Phonenumber', array(1, 2, 3));
+        $user->unlink('Phonenumber', array(1, 2, 3), true);
         
         $this->assertEqual($user->Phonenumber->count(), 0);

branches/1.1/tests/Ticket/1436TestCase.php

@@ -63 +63 @@
     public function testSynchronizeAddMNLinks()
     {
-        $user = Doctrine_Query::create()->from('User u, u.Group g')->fetchOne();
+        $user = Doctrine_Query::create()->from('User u')->fetchOne();
         $userArray = array(
             'Group' => array(
                 '_identifiers' => array(
-                    $this->group_one,
-                    $this->group_two,
-                    $this->group_three
+                    $this->group_one => true,
+                    $this->group_two => true,
+                    $this->group_three => false
                     )
             ));
 
         $user->synchronizeWithArray($userArray);
-        $this->assertEqual($user->Group->count(), 3);
-        $user->save();
-        $user->free();
 
+        try {
+          $user->save();
+        } catch (Exception $e ) {
+          $this->fail("Failed saving with " . $e->getMessage());
+        }
+    }
+    public function testSynchronizeAddMNLinksAfterSave()
+    {
         $user = Doctrine_Query::create()->from('User u, u.Group g')->fetchOne();
-        $this->assertEqual($user->Group->count(), 3);
         $this->assertEqual($user->Group[0]->name, 'Group One');
         $this->assertEqual($user->Group[1]->name, 'Group Two');
-        $this->assertEqual($user->Group[2]->name, 'Group Three');
+        $this->assertTrue(!isset($user->Group[2]));
     }
-
-    public function testSynchronizeRemoveMNLinks()
+    public function testSynchronizeChangeMNLinks()
     {
         $user = Doctrine_Query::create()->from('User u, u.Group g')->fetchOne();
@@ -91 +94 @@
             'Group' => array(
                 '_identifiers' => array(
-                    $this->group_three
+                    $this->group_one => false,
+                    $this->group_two => true,
+                    $this->group_three => true
                     )
             ));
-
+        
         $user->synchronizeWithArray($userArray);
-        $this->assertEqual($user->Group->count(), 1);
-        $user->save();
-        $user->free();
-
-        $user = Doctrine_Query::create()->from('User u, u.Group g')->fetchOne();
-        $this->assertEqual($user->Group->count(), 1);
-        $this->assertEqual($user->Group[0]->name, 'Group Three');
-    }
-
-    public function testSynchronizeRemoveAllLinks()
-    {
-        $user = Doctrine_Query::create()->from('User u, u.Group g')->fetchOne();
-        $userArray = array(
-            'Group' => array(
-                '_identifiers' => array()
-            ));
-
-        $user->synchronizeWithArray($userArray);
-        $this->assertEqual($user->Group->count(), 0);
-        $user->save();
-        $user->free();
-
-        $user = Doctrine_Query::create()->from('User u, u.Group g')->fetchOne();
-        $this->assertEqual($user->Group->count(), 0);
-    }
-
-    public function testSynchronizeDoesNotPersistUntilSave()
-    {
-        $user = Doctrine_Query::create()->from('User u, u.Group g')->fetchOne();
-        $userArray = array(
-            'Group' => array(
-                '_identifiers' => array(
-                    $this->group_three
-                    )
-            ));
-
+        
+        $this->assertTrue(!isset($user->Groups));
+        
         try {
-            $user->synchronizeWithArray($userArray);
-            $this->pass();
-        } catch (Exception $e) {
-            $this->fail($e->getMessage());
+          $user->save();
+        } catch (Exception $e ) {
+          $this->fail("Failed saving with " . $e->getMessage());
         }
         
-        $this->assertEqual($user->Group->count(), 1);
-        $user->free();
-
-        $user = Doctrine_Query::create()->from('User u, u.Group g')->fetchOne();
-        $this->assertEqual($user->Group->count(), 0);
+        $user->refresh();
+        $user->loadReference('Group');
+        
+        $this->assertEqual($user->Group[0]->name, 'Group Two');
+        $this->assertEqual($user->Group[1]->name, 'Group Three');
+        $this->assertTrue(!isset($user->Group[2]));
+    }
+    public function testSynchronizeMNRecordsDontDeleteAfterUnlink()
+    {
+        $group = Doctrine::getTable('Group')->find($this->group_one);
+        
+        $this->assertTrue(!empty($group));
+        $this->assertEqual($group->name, 'Group One');
     }
 }