Doctrine

Timestamp:

04/25/08 19:55:17 (15 months ago)

Author:

romanb

Message:

Changed the deletion to simply ignore transient objects in general. This is a much better behavior (in fact this is how it used to be in the past).

Location:

branches/0.11

Files:

• lib/Doctrine/Connection/UnitOfWork.php (modified) (2 diffs)
• tests/ConnectionTestCase.php (modified) (1 diff)
• tests/RecordTestCase.php (modified) (1 diff)

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

@@ -181 +181 @@
     {
         if ( ! $record->exists()) {
-            throw new Doctrine_Connection_Exception("Transient records can't be deleted.");
+            return;
         }
 
@@ -340 +340 @@
                  }
                  $relatedObjects = $record->get($relation->getAlias());
-                 // 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()])) {

branches/0.11/tests/ConnectionTestCase.php

@@ -150 +150 @@
     }
 
-    public function testDeleteOnTransientRecordThrowsException() 
+    public function testDeleteOnTransientRecordIsIgnored() 
     {
         $user = $this->connection->create('User');
         try {
             $this->connection->unitOfWork->delete($user);
+        } catch (Doctrine_Connection_Exception $e) {
             $this->fail();
-        } catch (Doctrine_Connection_Exception $e) {
-            $this->pass();
         }
     }

branches/0.11/tests/RecordTestCase.php

@@ -985 +985 @@
         $this->assertTrue($user->delete());
         try {
+          // delete() on transient objects should just be ignored.
           $user->delete();
+        } catch (Exception $e) {
           $this->fail();
-        } catch (Exception $e) {
-          $this->pass();
         }
     }