Doctrine

Timestamp:

12/17/08 20:38:36 (7 months ago)

Author:

jwage

Message:

[1.0, 1.1] Fixes issue with validators not passing when a related object is set for a foreign key and the foreign key field is notnull (closes #1755)

Location:

branches

Files:

• 1.0/lib/Doctrine/Table.php (modified) (1 diff)
• 1.0/tests/run.php (modified) (1 diff)
• 1.0/tests/Validator/ForeignKeysTestCase.php (added)
• 1.1/lib/Doctrine/Table.php (modified) (1 diff)
• 1.1/tests/run.php (modified) (1 diff)
• 1.1/tests/Validator/ForeignKeysTestCase.php (added)

branches/1.0/lib/Doctrine/Table.php

@@ -1676 +1676 @@
         if ($value === self::$_null) {
             $value = null;
-        } else if ($value instanceof Doctrine_Record) {
+        } else if ($value instanceof Doctrine_Record && $value->exists()) {
             $value = $value->getIncremented();
+        } else if ($value instanceof Doctrine_Record && ! $value->exists()) {
+            foreach($this->getRelations() as $relation) {
+                if($fieldName == $relation->getLocalFieldName() && get_class($value) == $relation->getClass()) {
+                    return $errorStack;
+                }
+            }
         }
 

branches/1.0/tests/run.php

@@ -183 +183 @@
 $validators->addTestCase(new Doctrine_Validator_Future_TestCase());
 $validators->addTestCase(new Doctrine_Validator_Past_TestCase());
+$validators->addTestCase(new Doctrine_Validator_ForeignKeys_TestCase());
 $test->addTestCase($validators);
 

branches/1.1/lib/Doctrine/Table.php

@@ -1736 +1736 @@
         if ($value === self::$_null) {
             $value = null;
-        } else if ($value instanceof Doctrine_Record) {
+        } else if ($value instanceof Doctrine_Record && $value->exists()) {
             $value = $value->getIncremented();
+        } else if ($value instanceof Doctrine_Record && ! $value->exists()) {
+            foreach($this->getRelations() as $relation) {
+                if($fieldName == $relation->getLocalFieldName() && get_class($value) == $relation->getClass()) {
+                    return $errorStack;
+                }
+            }
         }
 

branches/1.1/tests/run.php

@@ -185 +185 @@
 $validators->addTestCase(new Doctrine_Validator_Future_TestCase());
 $validators->addTestCase(new Doctrine_Validator_Past_TestCase());
+$validators->addTestCase(new Doctrine_Validator_ForeignKeys_TestCase());
 $test->addTestCase($validators);