Doctrine

Timestamp:

04/25/08 19:41:36 (15 months ago)

Author:

romanb

Message:

Fixed a bug in the new application-level cascading deletes.

Location:

branches/0.11

Files:

• lib/Doctrine/Connection/UnitOfWork.php (modified) (1 diff)
• tests/Record/CascadingDeleteTestCase.php (modified) (1 diff)

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

@@ -340 +340 @@
                  }
                  $relatedObjects = $record->get($relation->getAlias());
-                 if ($relatedObjects instanceof Doctrine_Record &&
-                        ! isset($deletions[$relatedObjects->getOid()])) {
+                 // note: The exists() check is needed because a related object is created
+                 // on-the-fly on access and we need to make sure it's not such an object.
+                 if ($relatedObjects instanceof Doctrine_Record && $relatedObjects->exists()
+                        && ! isset($deletions[$relatedObjects->getOid()])) {
                      $this->_collectDeletions($relatedObjects, $deletions);
                  } else if ($relatedObjects instanceof Doctrine_Collection && count($relatedObjects) > 0) {

branches/0.11/tests/Record/CascadingDeleteTestCase.php

@@ -136 +136 @@
     }
     
+    public function testCascadingDeleteInOneToZeroOrOneRelation()
+    {
+        $owner = new CascadeDelete_HouseOwner();
+        $owner->name = 'Jeff Bridges';
+        $owner->save();
+        try {
+            $owner->delete();
+            $this->pass();
+        } catch (Doctrine_Exception $e) {
+            $this->fail("Failed to delete record. Message:" . $e->getMessage());
+        }
+        
+    }
+    
     public function testDeletionOfCompositeKeys()
     {