Doctrine

Timestamp:

01/19/08 02:25:14 (18 months ago)

Author:

dbrewer

Message:

#740: fixed issue with hydrate when given an array containing null values. Previously, if you loaded a record from the database,
then something changed that record in the database, and you loaded the same record again in the same script, any values that had
been changed to null in the database would not be updated in the reloaded object.

Files:

• branches/0.9/lib/Doctrine/Record.php (modified) (2 diffs)

branches/0.9/lib/Doctrine/Record.php

@@ -426 +426 @@
     /**
      * cleanData
+     * leaves the $data array only with values whose key is a field inside this
+     * record and returns the values that were removed from $data.  Also converts
+     * any values of 'null' to objects of type Doctrine_Null.
      *
      * @param array $data       data array to be cleaned
-     * @return integer
+     * @return array $tmp       values cleaned from data
      */
     public function cleanData(&$data)
@@ -438 +441 @@
             if (isset($tmp[$name])) {
                 $data[$name] = $tmp[$name];
+            } else if (array_key_exists($name, $tmp)) {
+                $data[$name] = self::$_null;
             } else if (!isset($this->_data[$name])) {
                 $data[$name] = self::$_null;