Changeset 4826

Timestamp:

08/27/08 02:47:26 (5 months ago)

Author:

jwage

Message:

fixes #1383

Location:

branches/1.0/lib/Doctrine

Files:

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

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

@@ -49 +49 @@
     public function saveGraph(Doctrine_Record $record)
     {
+        $record->assignInheritanceValues();
+
         $conn = $this->getConnection();
 

branches/1.0/lib/Doctrine/Record.php

@@ -447 +447 @@
         } else {
             return $this->getErrorStack();
+        }
+    }
+
+    /**
+     * Assign the inheritance column values
+     *
+     * @return void
+     */
+    public function assignInheritanceValues()
+    {
+        $map = $this->_table->inheritanceMap;
+        foreach ($map as $k => $v) {
+            $k = $this->_table->getFieldName($k);
+            $old = $this->get($k, false);
+
+            if ((string) $old !== (string) $v || $old === null) {
+                $this->set($k, $v);
+            }
         }
     }
@@ -1290 +1308 @@
             }
         }
-        $map = $this->_table->inheritanceMap;
-        foreach ($map as $k => $v) {
-            $k = $this->_table->getFieldName($k);
-            $old = $this->get($k, false);
-
-            if ((string) $old !== (string) $v || $old === null) {
-                $a[$k] = $v;
-                $this->_data[$k] = $v;
-            }
-        }
 
         return $a;