Doctrine

Timestamp:

04/22/08 13:47:41 (15 months ago)

Author:

jwage

Message:

Fixed delete() so it returns true as it did before.

Location:

branches/0.11

Files:

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

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

@@ -169 +169 @@
         $deletions = array();
         $this->_collectDeletions($record, $deletions);
-        $this->_executeDeletions($deletions);
+        return $this->_executeDeletions($deletions);
     }
 
@@ -272 +272 @@
             }
 
+            return true;
         } catch (Exception $e) {
             $this->conn->rollback();

branches/0.11/tests/RecordTestCase.php

@@ -728 +728 @@
             //$this->assertEqual(count($emails),0);
         } catch (Exception $e) {
-            $this->fail();
+            $this->fail($e->getMessage());
         }
     }
@@ -975 +975 @@
         $this->assertEqual($user->name, 'jon wage changed2');
     }
+
+    public function testDeleteReturnBooleanAndThrowsException()
+    {
+        $user = new User();
+        $user->name = 'jonnnn wage';
+        $user->loginname = 'jwage3';
+        $user->save();
+
+        $this->assertTrue($user->delete());
+        try {
+          $user->delete();
+          $this->fail();
+        } catch (Exception $e) {
+          $this->pass();
+        }
+    }
 }