Changeset 4704 for branches/1.0/lib/Doctrine/Connection/UnitOfWork.php

Timestamp:

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

Author:

guilhermeblanco

Message:

Merged changeset r4696 into 1.0 branch

Files:

• branches/1.0/lib/Doctrine/Connection/UnitOfWork.php (modified) (2 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) {