Merge branch 'backport/#1202-backport-null-column-option-values' into…

… 2.4
doctrine · Dec 8, 2014 · 39f2f0e · 39f2f0e
2 parents f45cf26 + a5a7c87
commit 39f2f0e
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 1 deletion.
diff --git a/lib/Doctrine/ORM/Tools/SchemaTool.php b/lib/Doctrine/ORM/Tools/SchemaTool.php
@@ -430,7 +430,7 @@ private function gatherColumn($class, array $mapping, Table $table)
             $knownOptions = array('comment', 'unsigned', 'fixed', 'default');
 
             foreach ($knownOptions as $knownOption) {
-                if ( isset($mapping['options'][$knownOption])) {
+                if (array_key_exists($knownOption, $mapping['options'])) {
                     $options[$knownOption] = $mapping['options'][$knownOption];
 
                     unset($mapping['options'][$knownOption]);

diff --git a/tests/Doctrine/Tests/Models/NullDefault/NullDefaultColumn.php b/tests/Doctrine/Tests/Models/NullDefault/NullDefaultColumn.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace Doctrine\Tests\Models\NullDefault;
+
+/** @Entity */
+class NullDefaultColumn
+{
+    /** @Id @GeneratedValue @Column(type="integer") */
+    public $id;
+
+    /** @Column(options={"default":NULL}) */
+    public $nullDefault;
+}
diff --git a/tests/Doctrine/Tests/ORM/Tools/SchemaToolTest.php b/tests/Doctrine/Tests/ORM/Tools/SchemaToolTest.php
@@ -101,6 +101,23 @@ public function testPostGenerateEvents()
         $this->assertEquals(count($classes), $listener->tableCalls);
         $this->assertTrue($listener->schemaCalled);
     }
+
+    public function testNullDefaultNotAddedToCustomSchemaOptions()
+    {
+        $em = $this->_getTestEntityManager();
+        $schemaTool = new SchemaTool($em);
+
+        $classes = array(
+            $em->getClassMetadata('Doctrine\Tests\Models\NullDefault\NullDefaultColumn'),
+        );
+
+        $customSchemaOptions = $schemaTool->getSchemaFromMetadata($classes)
+            ->getTable('NullDefaultColumn')
+            ->getColumn('nullDefault')
+            ->getCustomSchemaOptions();
+
+        $this->assertSame(array(), $customSchemaOptions);
+    }
 }
 
 /**