Changeset 4346

Timestamp:

05/10/08 01:07:20 (8 months ago)

Author:

jwage

Message:

Fixing issue where custom setter for data fixtures is only called for relations and not fields too. Changed to call custom setter if it is defined on the fixture Doctrine_Record.

Files:

• branches/0.11/lib/Doctrine/Data/Import.php (modified) (1 diff)

branches/0.11/lib/Doctrine/Data/Import.php

@@ -192 +192 @@
 
         foreach ($row as $key => $value) {
-            if ($obj->getTable()->hasField($key)) {
+            if (method_exists($obj, 'set' . Doctrine_Inflector::classify($key))) {
+                $func = 'set' . Doctrine_Inflector::classify($key);
+                $obj->$func($value);
+            } else if ($obj->getTable()->hasField($key)) {
                 $obj->set($key, $value);
-            } else if (method_exists($obj, 'set' . Doctrine_Inflector::classify($key))) {
-                    $func = 'set' . Doctrine_Inflector::classify($key);
-                    $obj->$func($value);
             } else if ($obj->getTable()->hasRelation($key)) {
                 if (is_array($value)) {