Changeset 4779 for branches/1.0

Timestamp:

08/19/08 02:44:07 (5 months ago)

Author:

guilhermeblanco

Message:

fixed #1266. Thanks for the information!
Also I removed the comments I added previously in JoinConditionTestCase?.php

Location:

branches/1.0

Files:

• lib/Doctrine/Export.php (modified) (2 diffs)
• lib/Doctrine/Export/Mssql.php (modified) (1 diff)
• tests/Query/JoinConditionTestCase.php (modified) (2 diffs)

branches/1.0/lib/Doctrine/Export.php

@@ -716 +716 @@
                     ' ' . $this->getCollationFieldDeclaration($field['collation']) : '';
 
-        $notnull   = (isset($field['notnull']) && $field['notnull']) ? ' NOT NULL' : '';
+        $notnull   = $this->getNotNullFieldDeclaration($field);
 
         $unique    = (isset($field['unique']) && $field['unique']) ?
@@ -774 +774 @@
         return $default;
     }
+    
+
+    /**
+     * getDefaultDeclaration
+     * Obtain DBMS specific SQL code portion needed to set a NOT NULL
+     * declaration to be used in statements like CREATE TABLE.
+     *
+     * @param array $field      field definition array
+     * @return string           DBMS specific SQL code portion needed to set a default value
+     */
+    public function getNotNullFieldDeclaration(array $definition)
+    {
+        return (isset($field['notnull']) && $field['notnull']) ? ' NOT NULL' : '';
+    }
+    
 
     /**

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

@@ -254 +254 @@
         return 'DROP TABLE ' . $sequenceName;
     }
+    
+    
+    /**
+     * getDefaultDeclaration
+     * Obtain DBMS specific SQL code portion needed to set a NOT NULL
+     * declaration to be used in statements like CREATE TABLE.
+     *
+     * @param array $field      field definition array
+     * @return string           DBMS specific SQL code portion needed to set a default value
+     */
+    public function getNotNullFieldDeclaration(array $definition)
+    {
+        return (isset($field['notnull']) && $field['notnull']) ? ' NOT NULL' : ' NULL';
+    }
 }

branches/1.0/tests/Query/JoinConditionTestCase.php

@@ -39 +39 @@
     { }
 
-    /*public function testJoinConditionsAreSupportedForOneToManyLeftJoins()
+    public function testJoinConditionsAreSupportedForOneToManyLeftJoins()
     {
         $q = new Doctrine_Query();
@@ -82 +82 @@
 
         $this->assertEqual($q->getQuery(), "SELECT e.id AS e__id, e.name AS e__name, p.id AS p__id FROM entity e LEFT JOIN phonenumber p ON e.name = p.phonenumber WHERE (e.type = 0)");
-    }*/
-    
+    }
+
     public function testJoinWithConditionAndNotInClause()
     {