Changeset 4580

Timestamp:

06/28/08 07:28:01 (6 months ago)

Author:

jwage

Message:

fixes #1078 fixes #1117

Location:

branches/0.11

Files:

• lib/Doctrine/Collection.php (modified) (1 diff)
• lib/Doctrine/Record.php (modified) (6 diffs)
• tests/Record/FromArrayTestCase.php (modified) (1 diff)
• tests/Record/SynchronizeTestCase.php (modified) (1 diff)
• tests/run.php (modified) (1 diff)

branches/0.11/lib/Doctrine/Collection.php

@@ -721 +721 @@
         // create new records for each new row in the array
         foreach ($array as $rowKey => $row) {
-            $this[$rowKey]->fromArray($row);
+            $this[$rowKey]->synchronizeWithArray($row);
         }
     }

branches/0.11/lib/Doctrine/Record.php

@@ -914 +914 @@
     {
         if (isset($this->_data[$fieldName])) {
+            $type = $this->_table->getTypeOf($fieldName);
             if ($value instanceof Doctrine_Record) {
-                $type = $this->_table->getTypeOf($fieldName);
-
                 $id = $value->getIncremented();
 
@@ -930 +929 @@
             }
 
-            if ($old !== $value) {
+            if ($this->_isValueModified($type, $old, $value)) {
                 if ($value === null) {
                     $value = self::$_null;
@@ -959 +958 @@
 
         return $this;
+    }
+
+    /**
+     * Check if a value has changed according to Doctrine
+     * Doctrine is loose with type checking in the same ways PHP is for consistancy of behavior
+     *
+     * This function basically says if what is being set is of Doctrine type boolean and something
+     * like current_value == 1 && new_value = true would not be considered modified
+     *
+     * Simply doing $old !== $new will return false for boolean columns would mark the field as modified
+     * and change it in the database when it is not necessary
+     *
+     * @param string $type  Doctrine type of the column
+     * @param string $old   Old value
+     * @param string $new   New value
+     * @return boolean $modified  Whether or not Doctrine considers the value modified
+     */
+    protected function _isValueModified($type, $old, $new)
+    {
+        if ($type == 'boolean' && (is_bool($old) || is_numeric($old)) && (is_bool($new) || is_numeric($new)) && $old == $new) {
+            return false;
+        } else {
+            return $old !== $new;
+        }
     }
 
@@ -1339 +1362 @@
     public function fromArray($array, $deep = true)
     {
-        if (is_array($array)) {
-            foreach ($array as $key => $value) {
-                if ($deep && $this->getTable()->hasRelation($key)) {
-                    $this->$key->fromArray($value, $deep);
-                } else if ($this->getTable()->hasField($key)) {
-                    $this->set($key, $value);
-                }
-            }
-        }
+        return $this->synchronizeWithArray($array, $deep);
     }
 
@@ -1361 +1376 @@
      * @param array $array representation of a Doctrine_Record
      */
-    public function synchronizeWithArray(array $array)
-    {
+    public function synchronizeWithArray(array $array, $deep = true)
+    {
+        $refresh = false;
         foreach ($array as $key => $value) {
-            if ($this->getTable()->hasRelation($key)) {
+            if ($key == 'identifier') {
+                $refresh = true;
+                $this->assignIdentifier((array) $value);
+                continue;
+            }
+            if ($deep && $this->getTable()->hasRelation($key)) {
                 $this->get($key)->synchronizeWithArray($value);
             } else if ($this->getTable()->hasField($key)) {
@@ -1376 +1397 @@
                 unset($this->$name);
             }
+        }
+
+        if ($refresh) {
+            $this->refresh();
         }
     }

branches/0.11/tests/Record/FromArrayTestCase.php

@@ -59 +59 @@
         
         # add group
-        $userArray['Group'][]['name'] = 'New Group'; # This is a n-m relationship
+        $userArray['Group'][0]['name'] = 'New Group'; # This is a n-m relationship
         # add a group which exists
-        $userArray['Group'][1]['id'] = $this->previous_group; # This is a n-m relationship where the group was made in prepareData
+        $userArray['Group'][1]['identifier'] = $this->previous_group; # This is a n-m relationship where the group was made in prepareData
           
         $user->fromArray($userArray);

branches/0.11/tests/Record/SynchronizeTestCase.php

@@ -70 +70 @@
         $userArray['Group'][]['name'] = 'New Group'; # This is a n-m relationship
         // add a group which exists
-        $userArray['Group'][1]['id'] = $this->previous_group; # This is a n-m relationship where the group was made in prepareData
+        $userArray['Group'][1]['identifier'] = $this->previous_group; # This is a n-m relationship where the group was made in prepareData
 
         $user->synchronizeWithArray($userArray);

branches/0.11/tests/run.php

@@ -292 +292 @@
 $record->addTestCase(new Doctrine_Record_Inheritance_TestCase());
 $record->addTestCase(new Doctrine_Record_Synchronize_TestCase());
-$record->addTestCase(new Doctrine_Record_Generator_TestCase());
 $record->addTestCase(new Doctrine_Record_FromArray_TestCase());
 $test->addTestCase($record);