Fixed doctrine column type comments

doctrine · Dec 28, 2011 · 42f429a · 42f429a
1 parent b066e54
commit 42f429a
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 1 deletion.
diff --git a/lib/Doctrine/DBAL/Platforms/AbstractPlatform.php b/lib/Doctrine/DBAL/Platforms/AbstractPlatform.php
@@ -1095,7 +1095,7 @@ public function getCreateTableSQL(Table $table, $createFlags=self::CREATE_INDEXE
         $sql = $this->_getCreateTableSQL($tableName, $columns, $options);
         if ($this->supportsCommentOnStatement()) {
             foreach ($table->getColumns() AS $column) {
-                if ($column->getComment()) {
+                if ($this->getColumnComment($column)) {
                     $sql[] = $this->getCommentOnColumnSQL($tableName, $column->getName(), $this->getColumnComment($column));
                 }
             }

diff --git a/tests/Doctrine/Tests/DBAL/Platforms/AbstractPlatformTestCase.php b/tests/Doctrine/Tests/DBAL/Platforms/AbstractPlatformTestCase.php
@@ -326,6 +326,16 @@ public function testAlterTableColumnComments()
         $this->assertEquals($this->getAlterTableColumnCommentsSQL(), $this->_platform->getAlterTableSQL($tableDiff));
     }
 
+    public function testCreateTableColumnTypeComments()
+    {
+        $table = new \Doctrine\DBAL\Schema\Table('test');
+        $table->addColumn('id', 'integer');
+        $table->addColumn('data', 'array');
+        $table->setPrimaryKey(array('id'));
+
+        $this->assertEquals($this->getCreateTableColumnTypeCommentsSQL(), $this->_platform->getCreateTableSQL($table));
+    }
+
     public function getCreateTableColumnCommentsSQL()
     {
         $this->markTestSkipped('Platform does not support Column comments.');
@@ -336,6 +346,11 @@ public function getAlterTableColumnCommentsSQL()
         $this->markTestSkipped('Platform does not support Column comments.');
     }
 
+    public function getCreateTableColumnTypeCommentsSQL()
+    {
+        $this->markTestSkipped('Platform does not support Column comments.');
+    }
+
     /**
      * @group DBAL-45
      */

diff --git a/tests/Doctrine/Tests/DBAL/Platforms/MySqlPlatformTest.php b/tests/Doctrine/Tests/DBAL/Platforms/MySqlPlatformTest.php
@@ -204,4 +204,9 @@ public function getAlterTableColumnCommentsSQL()
     {
         return array("ALTER TABLE mytable ADD quota INT NOT NULL COMMENT 'A comment', CHANGE bar baz VARCHAR(255) NOT NULL COMMENT 'B comment'");
     }
+
+    public function getCreateTableColumnTypeCommentsSQL()
+    {
+        return array("CREATE TABLE test (id INT NOT NULL, data LONGTEXT NOT NULL COMMENT '(DC2Type:array)', PRIMARY KEY(id)) ENGINE = InnoDB");
+    }
 }
diff --git a/tests/Doctrine/Tests/DBAL/Platforms/OraclePlatformTest.php b/tests/Doctrine/Tests/DBAL/Platforms/OraclePlatformTest.php
@@ -195,6 +195,14 @@ public function getCreateTableColumnCommentsSQL()
         );
     }
 
+    public function getCreateTableColumnTypeCommentsSQL()
+    {
+        return array(
+            "CREATE TABLE test (id NUMBER(10) NOT NULL, data CLOB NOT NULL, PRIMARY KEY(id))",
+            "COMMENT ON COLUMN test.data IS '(DC2Type:array)'"
+        );
+    }
+
     public function getAlterTableColumnCommentsSQL()
     {
         return array(

diff --git a/tests/Doctrine/Tests/DBAL/Platforms/PostgreSqlPlatformTest.php b/tests/Doctrine/Tests/DBAL/Platforms/PostgreSqlPlatformTest.php
@@ -216,4 +216,12 @@ public function getAlterTableColumnCommentsSQL()
             "COMMENT ON COLUMN mytable.baz IS 'B comment'",
         );
     }
+
+    public function getCreateTableColumnTypeCommentsSQL()
+    {
+        return array(
+            "CREATE TABLE test (id INT NOT NULL, data TEXT NOT NULL, PRIMARY KEY(id))",
+            "COMMENT ON COLUMN test.data IS '(DC2Type:array)'"
+        );
+    }
 }