Doctrine

Timestamp:

06/08/08 17:55:22 (13 months ago)

Author:

romanb

Message:

Fixed #1072. Please read through my comments in the testcase to see what has been fixed, what not and for what reasons.

Location:

branches/0.11

Files:

• lib/Doctrine/Connection/UnitOfWork.php (modified) (1 diff)
• lib/Doctrine/Record.php (modified) (4 diffs)
• tests/Ticket/1072TestCase.php (modified) (2 diffs)

branches/0.11/lib/Doctrine/Connection/UnitOfWork.php

@@ -68 +68 @@
             $record->getTable()->getRecordListener()->preSave($event);
             $state = $record->state();
-
+            
             if ( ! $event->skipOperation) {
                 switch ($state) {

branches/0.11/lib/Doctrine/Record.php

@@ -834 +834 @@
                 $this->load();
             }
-
             if ($this->_data[$fieldName] === self::$_null) {
                 $value = null;
@@ -846 +845 @@
             return $this->_values[$fieldName];
         }
-
+        
         try {
             if ( ! isset($this->_references[$fieldName]) && $load) {
@@ -1186 +1185 @@
                 default:
                     if ($this->_data[$field] instanceof Doctrine_Record) {
-                        $this->_data[$field] = $this->_data[$field]->getIncremented();
+                        $a[$field] = $this->_data[$field]->getIncremented();
+                        if ($a[$field] !== null) {
+                            $this->_data[$field] = $a[$field];
+                        }
+                    } else {
+                        $a[$field] = $this->_data[$field];
                     }
                     /** TODO:
@@ -1193 +1197 @@
                     }
                     */
-
-                    $a[$field] = $this->_data[$field];
             }
         }

branches/0.11/tests/Ticket/1072TestCase.php

@@ -37 +37 @@
         
         // If I access this relation...
+        
         if ($bt->T1072PaymentDetail) {
         }
         
         // (additional check: value must still be NULL not an object)
-        $this->assertEqual(gettype($bt->payment_detail_id), gettype(null));
+        // [romanb]: This is expected behavior currently. Accessing a related record will create
+        // a new one if there is none yet. This makes it possible to use syntax like:
+        // $record = new Record();
+        // $record->Related->name = 'foo'; // will implicitly create a new Related
+        // In addition the foreign key field is set to a reference to the new record (ugh..).
+        // No way to change this behavior at the moment for BC reasons.
+        $this->assertEqual(gettype($bt->payment_detail_id), 'object');
         
         // ...save...
+        // [romanb]: Related T1072PaymentDetail will not be saved because its not modified
+        // (isModified() == false)
         $bt->save();
         
@@ -49 +58 @@
             // ...and access the relation column it will throw
             // an exception here but it shouldn't.
+            // [romanb]: This has been fixed now. $bt->payment_detail_id will be an empty
+            // object as before.
             if ($bt->payment_detail_id) {
             }
             
             // (additional check: value must still be NULL not an object)
-            $this->assertEqual(gettype($bt->payment_detail_id), gettype(null));
+            // [romanb]: See above. This is an empty object now, same as before.
+            $this->assertEqual(gettype($bt->payment_detail_id), 'object');
             
             $this->pass();