Don't generate COMMENT '' in MySQL when creating tables.

Refs #4031
cakephp · Jul 21, 2014 · 9f49d17 · 9f49d17
1 parent c09e2b9
commit 9f49d17
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/src/Database/Schema/MysqlSchema.php b/src/Database/Schema/MysqlSchema.php
@@ -323,7 +323,7 @@ public function columnSql(Table $table, $name) {
 		) {
 			$out .= ' DEFAULT CURRENT_TIMESTAMP';
 		}
-		if (isset($data['comment'])) {
+		if (isset($data['comment']) && $data['comment'] !== '') {
 			$out .= ' COMMENT ' . $this->_driver->schemaValue($data['comment']);
 		}
 		return $out;

diff --git a/tests/TestCase/Database/Schema/MysqlSchemaTest.php b/tests/TestCase/Database/Schema/MysqlSchemaTest.php
@@ -700,7 +700,10 @@ public function testCreateSql() {
 				'null' => false,
 				'comment' => 'The title'
 			])
-			->addColumn('body', ['type' => 'text'])
+			->addColumn('body', [
+				'type' => 'text',
+				'comment' => ''
+			])
 			->addColumn('created', 'datetime')
 			->addConstraint('primary', [
 				'type' => 'primary',