Doctrine

Timestamp:

08/15/08 10:54:16 (11 months ago)

Author:

romanb

Message:

Fixed #1277. Added coverage for #1254.

Location:

branches/1.0

Files:

• lib/Doctrine/Record.php (modified) (5 diffs)
• lib/Doctrine/Table.php (modified) (1 diff)
• tests/run.php (modified) (1 diff)
• tests/Ticket/1254TestCase.php (added)
• tests/Ticket/1277TestCase.php (added)

branches/1.0/lib/Doctrine/Record.php

@@ -515 +515 @@
     {
         $this->_values = array_merge($this->_values, $this->cleanData($data));
-        $this->_data   = array_merge($this->_data, $data);
+        $this->_data = array_merge($this->_data, $data);
         $this->prepareIdentifiers(true);
     }
@@ -829 +829 @@
     /**
      * load
-     * loads all the uninitialized properties from the database
+     * Loads all the uninitialized properties from the database.
+     * Used to move a record from PROXY to CLEAN/DIRTY state.
      *
      * @return boolean
      */
-    public function load()
+    public function load(array $data = array())
     {
         // only load the data from database if the Doctrine_Record is in proxy state
         if ($this->_state == Doctrine_Record::STATE_PROXY) {
-            $this->refresh();
-            $this->_state = Doctrine_Record::STATE_CLEAN;
+            $id = $this->identifier();
+            if ( ! is_array($id)) {
+                $id = array($id);
+            }
+            if (empty($id)) {
+                return false;
+            }
+
+            $data = empty($data) ? $this->getTable()->find($id, Doctrine::HYDRATE_ARRAY) : $data;
+            foreach ($data as $field => $value) {
+               if ( ! isset($this->_data[$field]) || $this->_data[$field] === self::$_null) {
+                   $this->_data[$field] = $value;
+               }
+            }
+            
+            if ($this->isModified()) {
+               $this->_state = Doctrine_Record::STATE_DIRTY;
+            } else if (count($data) >= $this->_table->getColumnCount()) {
+                $this->_state = Doctrine_Record::STATE_CLEAN;
+            }
+            $this->cleanData($this->_data);
             return true;
         }
@@ -941 +961 @@
             if ($this->_isValueModified($type, $old, $value)) {
                 if ($value === null) {
-                    $default = $this->_table->getDefaultValueOf($fieldName);
+                    $default = $this->_table->getDefaultValueOf($fieldName); 
                     $value = ($default === null) ? self::$_null : $default;
                 }
-
                 $this->_data[$fieldName] = $value;
                 $this->_modified[] = $fieldName;
+
                 switch ($this->_state) {
                     case Doctrine_Record::STATE_CLEAN:
+                    case Doctrine_Record::STATE_PROXY:
                         $this->_state = Doctrine_Record::STATE_DIRTY;
                         break;
@@ -1255 +1276 @@
             }
         }
-
         $map = $this->_table->inheritanceMap;
         foreach ($map as $k => $v) {
@@ -1848 +1868 @@
             foreach ($ids as $id) {
                 $record = new $modelClassName;
-                $record[$localFieldName]   = $identifier;
+                $record[$localFieldName] = $identifier;
                 $record[$foreignFieldName] = $id;
                 $record->save();

branches/1.0/lib/Doctrine/Table.php

@@ -1431 +1431 @@
                 return $record;
             }
-
-
+            
             $id = implode(' ', $id);
 
             if (isset($this->_identityMap[$id])) {
+                //NOTE: This is still flawed as modifications are overridden in hydrate()
                 $record = $this->_identityMap[$id];
                 $record->hydrate($this->_data);
+                if ($record->state() == Doctrine_Record::STATE_PROXY) {
+                    if (count($this->_data) >= $this->getColumnCount()) {
+                        $record->state(Doctrine_Record::STATE_CLEAN);
+                    }
+                }
             } else {
                 $recordName = $this->getComponentName();

branches/1.0/tests/run.php

@@ -102 +102 @@
 $tickets->addTestCase(new Doctrine_Ticket_1251_TestCase());
 $tickets->addTestCase(new Doctrine_Ticket_1253_TestCase());
+$tickets->addTestCase(new Doctrine_Ticket_1254_TestCase());
 $tickets->addTestCase(new Doctrine_Ticket_1257_TestCase());
+$tickets->addTestCase(new Doctrine_Ticket_1277_TestCase());
 $tickets->addTestCase(new Doctrine_Ticket_1289_TestCase());
 $tickets->addTestCase(new Doctrine_Ticket_1296_TestCase());