Doctrine

Timestamp:

08/19/08 01:27:22 (11 months ago)

Author:

guilhermeblanco

Message:

fixed #1280. Fixed Export that never deals with default=null in all DBMS. Also fixed $entity->Relation = null; situation that cleans the reference.
Now we have unset and unlink that deletes related object and = null that only defines the default value when save() is called.

Location:

branches/1.0

Files:

• lib/Doctrine/DataDict/Mysql.php (modified) (1 diff)
• lib/Doctrine/DataDict/Pgsql.php (modified) (1 diff)
• lib/Doctrine/DataDict/Sqlite.php (modified) (1 diff)
• lib/Doctrine/Export.php (modified) (2 diffs)
• lib/Doctrine/Export/Mysql.php (modified) (1 diff)
• lib/Doctrine/Record.php (modified) (1 diff)
• lib/Doctrine/Record/Abstract.php (modified) (1 diff)
• tests/run.php (modified) (1 diff)
• tests/Ticket/1280TestCase.php (added)

branches/1.0/lib/Doctrine/DataDict/Mysql.php

@@ -458 +458 @@
                 $field['default'] = empty($field['notnull']) ? null : 0;
             }
-            if (is_null($field['default'])) {
-                $default = ' DEFAULT NULL';
-            } else {
-                $default = ' DEFAULT '.$this->conn->quote($field['default']);
-            }
+
+            $default = ' DEFAULT ' . (is_null($field['default'])
+                ? 'NULL'
+                : $this->conn->quote($field['default']));
         }
         /**

branches/1.0/lib/Doctrine/DataDict/Pgsql.php

@@ -614 +614 @@
                 $field['default'] = empty($field['notnull']) ? null : 0;
             }
-            $default = ' DEFAULT '.$this->conn->quote($field['default'], $field['type']);
+
+            $default = ' DEFAULT ' . (is_null($field['default'])
+                ? 'NULL'
+                : $this->conn->quote($field['default'], $field['type']));
         }
         /**

branches/1.0/lib/Doctrine/DataDict/Sqlite.php

@@ -296 +296 @@
                 $field['default'] = empty($field['notnull']) ? null : 0;
             }
-            $default = ' DEFAULT ' . $this->conn->quote($field['default'], $field['type']);
+
+            $default = ' DEFAULT ' . (is_null($field['default'])
+                ? 'NULL'
+                : $this->conn->quote($field['default'], $field['type']));
         }/**
         elseif (empty($field['notnull'])) {

branches/1.0/lib/Doctrine/Export.php

@@ -752 +752 @@
     {
         $default = '';
-        if (isset($field['default'])) {
+
+        if (array_key_exists('default', $field)) {
             if ($field['default'] === '') {
                 $field['default'] = empty($field['notnull'])
@@ -766 +767 @@
                 $field['default'] = $this->conn->convertBooleans($field['default']);
             }
-            $default = ' DEFAULT ' . $this->conn->quote($field['default'], $field['type']);
-        }
+            $default = ' DEFAULT ' . (is_null($field['default'])
+                ? 'NULL'
+                : $this->conn->quote($field['default'], $field['type']));
+        }
+
         return $default;
     }

branches/1.0/lib/Doctrine/Export/Mysql.php

@@ -605 +605 @@
             }
             
-            $default = ' DEFAULT ' . $this->conn->quote($field['default'], $fieldType);
+            $default = ' DEFAULT ' . (is_null($field['default'])
+                ? 'NULL' 
+                : $this->conn->quote($field['default'], $fieldType));
             //$default = ' DEFAULT ' . $this->conn->quote($field['default'], $field['type']);
         }
+        
         return $default;
     }

branches/1.0/lib/Doctrine/Record.php

@@ -1035 +1035 @@
                     throw new Doctrine_Record_Exception("Couldn't call Doctrine::set(), second argument should be an instance of Doctrine_Collection when setting one-to-many references.");
                 }
+
                 if (isset($this->_references[$name])) {
                     $this->_references[$name]->setData($value->getData());
+
                     return $this;
                 }
             } else {
+                $localFieldName = $this->_table->getFieldName($rel->getLocal());
+
                 if ($value !== self::$_null) {
                     $relatedTable = $value->getTable();
                     $foreignFieldName = $relatedTable->getFieldName($rel->getForeign());
-                    $localFieldName = $this->_table->getFieldName($rel->getLocal());
-
-                    // one-to-one relation found
-                    if ( ! ($value instanceof Doctrine_Record)) {
-                        throw new Doctrine_Record_Exception("Couldn't call Doctrine::set(), second argument should be an instance of Doctrine_Record or Doctrine_Null when setting one-to-one references.");
+                }
+
+                // one-to-one relation found
+                if ( ! ($value instanceof Doctrine_Record) && ! ($value instanceof Doctrine_Null)) {
+                    throw new Doctrine_Record_Exception("Couldn't call Doctrine::set(), second argument should be an instance of Doctrine_Record or Doctrine_Null when setting one-to-one references.");
+                }
+
+                if ($rel instanceof Doctrine_Relation_LocalKey) {
+                    if ($value !== self::$_null &&  ! empty($foreignFieldName) && $foreignFieldName != $value->getTable()->getIdentifier()) {
+                        $this->set($localFieldName, $value->rawGet($foreignFieldName), false);
+                    } else {
+                        // FIX: Ticket #1280 fits in this situation
+                        $this->set($localFieldName, $value, false);
                     }
-                    if ($rel instanceof Doctrine_Relation_LocalKey) {
-                        if ( ! empty($foreignFieldName) && $foreignFieldName != $value->getTable()->getIdentifier()) {
-                            $this->set($localFieldName, $value->rawGet($foreignFieldName), false);
-                        } else {
-                            $this->set($localFieldName, $value, false);
-                        }
-                    } else {
-                        $value->set($foreignFieldName, $this, false);
-                    }
+                } elseif ($value !== self::$_null) {
+                    // We should only be able to reach $foreignFieldName if we have a Doctrine_Record on hands
+                    $value->set($foreignFieldName, $this, false);
                 }
             }
-
         } else if ($rel instanceof Doctrine_Relation_Association) {
             // join table relation found

branches/1.0/lib/Doctrine/Record/Abstract.php

@@ -40 +40 @@
     public function setTableDefinition()
     {
-        
+
     }
     public function setUp()

branches/1.0/tests/run.php

@@ -115 +115 @@
 $tickets->addTestCase(new Doctrine_Ticket_1257_TestCase());
 $tickets->addTestCase(new Doctrine_Ticket_1277_TestCase());
+$tickets->addTestCase(new Doctrine_Ticket_1280_TestCase());
 $tickets->addTestCase(new Doctrine_Ticket_1289_TestCase());
 $tickets->addTestCase(new Doctrine_Ticket_1296_TestCase());