Allow mariadb current_tiemstmap() default vlaue

cakephp · Nov 28, 2017 · a481ef7 · a481ef7
1 parent c159efc
commit a481ef7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/src/Database/Schema/MysqlSchema.php b/src/Database/Schema/MysqlSchema.php
@@ -426,7 +426,7 @@ public function columnSql(TableSchema $schema, $name)
         }
         if (isset($data['default']) &&
             in_array($data['type'], [TableSchema::TYPE_TIMESTAMP, TableSchema::TYPE_DATETIME]) &&
-            strtolower($data['default']) === 'current_timestamp'
+            in_array(strtolower($data['default']), ['current_timestamp', 'current_timestamp()'])
         ) {
             $out .= ' DEFAULT CURRENT_TIMESTAMP';
             unset($data['default']);

diff --git a/tests/TestCase/Database/Schema/MysqlSchemaTest.php b/tests/TestCase/Database/Schema/MysqlSchemaTest.php
@@ -729,6 +729,11 @@ public static function columnSqlProvider()
                 ['type' => 'timestamp', 'null' => false, 'default' => 'current_timestamp'],
                 '`created` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP'
             ],
+            [
+                'created',
+                ['type' => 'timestamp', 'null' => false, 'default' => 'current_timestamp()'],
+                '`created` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP'
+            ],
             [
                 'open_date',
                 ['type' => 'timestamp', 'null' => false, 'default' => '2016-12-07 23:04:00'],