From 85ec5066919862b32aaee9c3f2fb7d14ce85bda3 Mon Sep 17 00:00:00 2001
From: gnat <gnat@625475ce-881a-0410-a577-b389adb331d8>
Date: Fri, 6 Jul 2007 21:18:36 +0000
Subject: [PATCH] fix some an infinite recursion when deleting records that
 reference each other with ownsOne

---
 lib/Doctrine/Connection/UnitOfWork.php | 11 +++++-
 lib/Doctrine/Record.php                |  6 +--
 tests/Record/LockTestCase.php          | 52 ++++++++++++++++++++++++++
 tests/run.php                          |  3 +-
 4 files changed, 67 insertions(+), 5 deletions(-)
 create mode 100644 tests/Record/LockTestCase.php

diff --git a/lib/Doctrine/Connection/UnitOfWork.php b/lib/Doctrine/Connection/UnitOfWork.php
index fe2398add..3845864ce 100644
--- a/lib/Doctrine/Connection/UnitOfWork.php
+++ b/lib/Doctrine/Connection/UnitOfWork.php
@@ -221,8 +221,12 @@ class Doctrine_Connection_UnitOfWork extends Doctrine_Connection_Module
         $event = new Doctrine_Event($this, Doctrine_Event::RECORD_DELETE);
 
         $record->preDelete($event);
+        
+        $record->state(Doctrine_Record::STATE_LOCKED);
 
         $this->deleteComposites($record);
+        
+        $record->state(Doctrine_Record::STATE_TDIRTY);
 
         if ( ! $event->skipOperation) {
             $this->conn->transaction->addDelete($record);
@@ -329,7 +333,12 @@ class Doctrine_Connection_UnitOfWork extends Doctrine_Connection_Module
                 case Doctrine_Relation::ONE_COMPOSITE:
                 case Doctrine_Relation::MANY_COMPOSITE:
                     $obj = $record->get($fk->getAlias());
-                    $obj->delete($this->conn);
+                    if ( $obj instanceof Doctrine_Record && 
+                           $obj->state() != Doctrine_Record::STATE_LOCKED)  {
+                            
+                            $obj->delete($this->conn);
+                           	
+                    }
                     break;
             }
         }
diff --git a/lib/Doctrine/Record.php b/lib/Doctrine/Record.php
index 99a46f790..0de37e02d 100644
--- a/lib/Doctrine/Record.php
+++ b/lib/Doctrine/Record.php
@@ -65,10 +65,10 @@ abstract class Doctrine_Record extends Doctrine_Record_Abstract implements Count
      */
     const STATE_TCLEAN      = 5;
     /**
-     * DELETED STATE
-     * a Doctrine_Record turns into deleted state when it is deleted
+     * LOCKED STATE
+     * a Doctrine_Record is temporarily locked during deletes
      */
-    const STATE_DELETED     = 6;
+    const STATE_LOCKED     = 6;
     /**
      * @var object Doctrine_Table $_table   the factory that created this data access object
      */
diff --git a/tests/Record/LockTestCase.php b/tests/Record/LockTestCase.php
new file mode 100644
index 000000000..bc369d470
--- /dev/null
+++ b/tests/Record/LockTestCase.php
@@ -0,0 +1,52 @@
+<?php
+
+class Doctrine_Record_Lock_TestCase extends Doctrine_UnitTestCase {
+    public function prepareTables() 
+    {
+        $this->tables[] = 'rec1';
+        $this->tables[] = 'rec2';
+        parent::prepareTables();
+    }    	
+        
+    public function prepareData() { }
+    
+    public function testDeleteRecords()
+    {
+    	$rec1 = new Rec1();
+        $rec1->first_name = 'Some name';
+        $rec1->Account = new Rec2();
+        $rec1->Account->address = 'Some address';
+        $rec1->save();
+        
+        $rec1->delete();
+        $this->pass();
+    }
+}
+
+class Rec1 extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('first_name', 'string', 128, array ());
+    }
+
+    public function setUp()
+    {
+        $this->ownsOne('Rec2 as Account', array('local' => 'id', 'foreign' => 'user_id'));
+    }
+}
+
+class Rec2  extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('user_id', 'integer', 10, array (  'unique' => true,));
+        $this->hasColumn('address', 'string', 150, array ());
+    }
+
+    public function setUp()
+    {
+        $this->ownsOne('Rec1 as User', 'Rec2.user_id');
+    }
+
+}
diff --git a/tests/run.php b/tests/run.php
index 94b6c5894..6bbce2fc4 100644
--- a/tests/run.php
+++ b/tests/run.php
@@ -280,7 +280,8 @@ $test->addTestCase(new Doctrine_NewCore_TestCase());
 
 $test->addTestCase(new Doctrine_Record_State_TestCase());
 
-
+// This test used to segfault php because of infinite recursion in Connection/UnitOfWork
+$test->addTestCase(new Doctrine_Record_Lock_TestCase());
 
 $test->addTestCase(new Doctrine_Tokenizer_TestCase());