Merge pull request #254 from jsor/custom_options

Pass options attribute in @column annotation to Schema\Column's customSchemaOptions
doctrine · Jan 15, 2012 · 27451a5 · 27451a5
2 parents 47e56de + 615e220
commit 27451a5
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 0 deletions.
diff --git a/lib/Doctrine/ORM/Tools/SchemaTool.php b/lib/Doctrine/ORM/Tools/SchemaTool.php
@@ -360,6 +360,10 @@ private function _gatherColumn($class, array $mapping, $table)
             $options['columnDefinition'] = $mapping['columnDefinition'];
         }
 
+        if (isset($mapping['options'])) {
+            $options['customSchemaOptions'] = $mapping['options'];
+        }
+
         if ($class->isIdGeneratorIdentity() && $class->getIdentifierFieldNames() == array($mapping['fieldName'])) {
             $options['autoincrement'] = true;
         }

diff --git a/tests/Doctrine/Tests/ORM/Tools/SchemaToolTest.php b/tests/Doctrine/Tests/ORM/Tools/SchemaToolTest.php
@@ -32,6 +32,21 @@ public function testAddUniqueIndexForUniqueFieldAnnocation()
         $this->assertTrue($schema->getTable('cms_users')->columnsAreIndexed(array('username')), "username column should be indexed.");
     }
 
+    public function testColumnAnnotationOptionsAttribute()
+    {
+        $em = $this->_getTestEntityManager();
+        $schemaTool = new SchemaTool($em);
+
+        $classes = array(
+            $em->getClassMetadata(__NAMESPACE__ . '\\TestEntityWithColumnAnnotationOptionsAttribute'),
+        );
+
+        $schema = $schemaTool->getSchemaFromMetadata($classes);
+
+        $expected = array('foo' => 'bar', 'baz' => array('key' => 'val'));
+        $this->assertEquals($expected, $schema->getTable('TestEntityWithColumnAnnotationOptionsAttribute')->getColumn('test')->getCustomSchemaOptions(), "options annotation are passed to the columns customSchemaOptions");
+    }
+
     /**
      * @group DDC-200
      */
@@ -86,6 +101,20 @@ public function testPostGenerateEvents()
     }
 }
 
+/**
+ * @Entity
+ */
+class TestEntityWithColumnAnnotationOptionsAttribute
+{
+    /** @Id @Column */
+    private $id;
+
+    /**
+     * @Column(type="string", options={"foo": "bar", "baz": {"key": "val"}})
+     */
+    private $test;
+}
+
 class GenerateSchemaEventListener
 {
     public $tableCalls = 0;