From 5670912d0da77a49d160f92919b2a53b5503f1fc Mon Sep 17 00:00:00 2001
From: Gareth Evans <garoevans@gmail.com>
Date: Wed, 3 Dec 2014 19:37:53 +0000
Subject: [PATCH] Added test that passes following previous commit

---
 .../Models/NullDefault/NullDefaultColumn.php  | 23 +++++++++++++++++++
 .../Tests/ORM/Tools/SchemaToolTest.php        | 17 ++++++++++++++
 2 files changed, 40 insertions(+)
 create mode 100644 tests/Doctrine/Tests/Models/NullDefault/NullDefaultColumn.php

diff --git a/tests/Doctrine/Tests/Models/NullDefault/NullDefaultColumn.php b/tests/Doctrine/Tests/Models/NullDefault/NullDefaultColumn.php
new file mode 100644
index 000000000..a8e28060e
--- /dev/null
+++ b/tests/Doctrine/Tests/Models/NullDefault/NullDefaultColumn.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace Doctrine\Tests\Models\NullDefault;
+
+/**
+ * @Entity
+ * @Table(name="null-default")
+ */
+class NullDefaultColumn
+{
+
+    /**
+     * @Id
+     * @GeneratedValue
+     * @Column(type="integer")
+     */
+    public $id;
+
+    /**
+     * @Column(name="`null-default`",nullable=true,options={"default":NULL})
+     */
+    public $nullDefault;
+}
diff --git a/tests/Doctrine/Tests/ORM/Tools/SchemaToolTest.php b/tests/Doctrine/Tests/ORM/Tools/SchemaToolTest.php
index aa80c145d..02c157f88 100644
--- a/tests/Doctrine/Tests/ORM/Tools/SchemaToolTest.php
+++ b/tests/Doctrine/Tests/ORM/Tools/SchemaToolTest.php
@@ -101,6 +101,23 @@ class SchemaToolTest extends \Doctrine\Tests\OrmTestCase
         $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('null-default')
+            ->getColumn('null-default')
+            ->getCustomSchemaOptions();
+
+        $this->assertSame(array(), $customSchemaOptions);
+    }
 }
 
 /**