Fix nullable field with default value in various db platforms.

null => true and a default value should create a nullable column with a default value not `DEFAULT NULL`. Refs #9686
cakephp · Nov 3, 2016 · c721dde · c721dde
1 parent 1a1263e
commit c721dde
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 11 deletions.
diff --git a/src/Database/Schema/MysqlSchema.php b/src/Database/Schema/MysqlSchema.php
@@ -389,8 +389,8 @@ public function columnSql(Table $table, $name)
         ) {
             $out .= ' AUTO_INCREMENT';
         }
-        if (isset($data['null']) && $data['null'] === true) {
-            $out .= $data['type'] === 'timestamp' ? ' NULL' : ' DEFAULT NULL';
+        if (isset($data['null']) && $data['null'] === true && $data['type'] === 'timestamp') {
+            $out .= ' NULL';
             unset($data['default']);
         }
         if (isset($data['default']) && !in_array($data['type'], ['timestamp', 'datetime'])) {

diff --git a/src/Database/Schema/PostgresSchema.php b/src/Database/Schema/PostgresSchema.php
@@ -402,7 +402,7 @@ public function columnSql(Table $table, $name)
         if (isset($data['null']) && $data['null'] === false) {
             $out .= ' NOT NULL';
         }
-        if (isset($data['null']) && $data['null'] === true) {
+        if (isset($data['null']) && $data['null'] === true && $data['type'] === 'timestamp') {
             $out .= ' DEFAULT NULL';
             unset($data['default']);
         }

diff --git a/src/Database/Schema/SqliteSchema.php b/src/Database/Schema/SqliteSchema.php
@@ -332,9 +332,8 @@ public function columnSql(Table $table, $name)
             $out .= ' PRIMARY KEY AUTOINCREMENT';
         }
 
-        if (isset($data['null']) && $data['null'] === true) {
+        if (isset($data['null']) && $data['null'] === true && $data['type'] === 'timestamp') {
             $out .= ' DEFAULT NULL';
-            unset($data['default']);
         }
         if (isset($data['default'])) {
             $out .= ' DEFAULT ' . $this->_driver->schemaValue($data['default']);

diff --git a/tests/TestCase/Database/Schema/MysqlSchemaTest.php b/tests/TestCase/Database/Schema/MysqlSchemaTest.php
@@ -470,6 +470,11 @@ public static function columnSqlProvider()
     {
         return [
             // strings
+            [
+                'title',
+                ['type' => 'string', 'length' => 25, 'null' => true, 'default' => null],
+                '`title` VARCHAR(25)',
+            ],
             [
                 'title',
                 ['type' => 'string', 'length' => 25, 'null' => false],
@@ -478,18 +483,23 @@ public static function columnSqlProvider()
             [
                 'title',
                 ['type' => 'string', 'length' => 25, 'null' => true, 'default' => 'ignored'],
-                '`title` VARCHAR(25) DEFAULT NULL'
+                '`title` VARCHAR(25) DEFAULT \'ignored\'',
             ],
             [
-                'id',
-                ['type' => 'string', 'length' => 32, 'fixed' => true, 'null' => false],
-                '`id` CHAR(32) NOT NULL'
+                'title',
+                ['type' => 'string', 'length' => 25, 'null' => true, 'default' => ''],
+                '`title` VARCHAR(25) DEFAULT \'\'',
             ],
             [
                 'role',
                 ['type' => 'string', 'length' => 10, 'null' => false, 'default' => 'admin'],
                 '`role` VARCHAR(10) NOT NULL DEFAULT \'admin\''
             ],
+            [
+                'id',
+                ['type' => 'string', 'length' => 32, 'fixed' => true, 'null' => false],
+                '`id` CHAR(32) NOT NULL'
+            ],
             [
                 'title',
                 ['type' => 'string'],

diff --git a/tests/TestCase/Database/Schema/PostgresSchemaTest.php b/tests/TestCase/Database/Schema/PostgresSchemaTest.php
@@ -625,7 +625,7 @@ public static function columnSqlProvider()
             [
                 'title',
                 ['type' => 'string', 'length' => 25, 'null' => true, 'default' => 'ignored'],
-                '"title" VARCHAR(25) DEFAULT NULL'
+                '"title" VARCHAR(25) DEFAULT \'ignored\'',
             ],
             [
                 'id',

diff --git a/tests/TestCase/Database/Schema/SqliteSchemaTest.php b/tests/TestCase/Database/Schema/SqliteSchemaTest.php
@@ -453,7 +453,7 @@ public static function columnSqlProvider()
             [
                 'title',
                 ['type' => 'string', 'length' => 25, 'null' => true, 'default' => 'ignored'],
-                '"title" VARCHAR(25) DEFAULT NULL'
+                '"title" VARCHAR(25) DEFAULT "ignored"',
             ],
             [
                 'id',