Changeset 4704

Timestamp:

07/23/08 21:19:40 (4 months ago)

Author:

guilhermeblanco

Message:

Merged changeset r4696 into 1.0 branch

Location:

branches/1.0/lib/Doctrine

Files:

• Connection/UnitOfWork.php (modified) (2 diffs)
• Record.php (modified) (5 diffs)

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

@@ -52 +52 @@
 
         $state = $record->state();
-        if ($state === Doctrine_Record::STATE_LOCKED) {
+        if ($state === Doctrine_Record::STATE_LOCKED || $state === Doctrine_Record::STATE_TLOCKED) {
             return false;
         }
 
-        $record->state(Doctrine_Record::STATE_LOCKED);
+        $record->state($record->exists() ? Doctrine_Record::STATE_LOCKED : Doctrine_Record::STATE_TLOCKED);
 
         $conn->beginInternalTransaction();
@@ -97 +97 @@
         $state = $record->state();
 
-        $record->state(Doctrine_Record::STATE_LOCKED);
+        $record->state($record->exists() ? Doctrine_Record::STATE_LOCKED : Doctrine_Record::STATE_TLOCKED);
 
         foreach ($saveLater as $fk) {

branches/1.0/lib/Doctrine/Record.php

@@ -79 +79 @@
     const STATE_LOCKED     = 6;
 
+        /**
+         * TLOCKED STATE
+         * a Doctrine_Record is temporarily locked (and transient) during deletes and saves
+         *
+         * This state is used internally to ensure that circular deletes
+         * and saves will not cause infinite loops
+         */
+        const STATE_TLOCKED     = 7;
+
+
     /**
      * @var Doctrine_Node_<TreeImpl>        node object
@@ -668 +678 @@
         $err = false;
         if (is_integer($state)) {
-            if ($state >= 1 && $state <= 6) {
+            if ($state >= 1 && $state <= 7) {
                 $this->_state = $state;
             } else {
@@ -1291 +1301 @@
     public function toArray($deep = true, $prefixKey = false)
     {
-        if ($this->_state == self::STATE_LOCKED) {
+        if ($this->_state == self::STATE_LOCKED || $this->_state == self::STATE_TLOCKED) {
             return false;
         }
         
         $stateBeforeLock = $this->_state;
-        $this->_state = self::STATE_LOCKED;
+        $this->_state = $this->exists() ? self::STATE_LOCKED : self::STATE_TLOCKED;
         
         $a = array();
@@ -1465 +1475 @@
     {
         return ($this->_state !== Doctrine_Record::STATE_TCLEAN &&
-                $this->_state !== Doctrine_Record::STATE_TDIRTY);
+                $this->_state !== Doctrine_Record::STATE_TDIRTY &&
+                $this->_state !== Doctrine_Record::STATE_TLOCKED);
     }
 
@@ -1925 +1936 @@
     public function free($deep = false)
     {
-        if ($this->_state != self::STATE_LOCKED) {
-            $this->_state = self::STATE_LOCKED;
+        if ($this->_state != self::STATE_LOCKED && $this->_state != self::STATE_TLOCKED) {
+            $this->_state = $this->exists() ? self::STATE_LOCKED : self::STATE_TLOCKED;
 
             $this->_table->getRepository()->evict($this->_oid);