Fixed allow DEFAULT_VALUE_CURRENT_TIMESTAMP for datetime column in psql (#299)

Author: lulco

CHANGELOG.md

@@ -4,6 +4,7 @@
 
 ### Fixed
 - decimal, float, double default values
+- allow DEFAULT_VALUE_CURRENT_TIMESTAMP for datetime column in psql
 
 ## [2.6.0] - 2024-07-19
 ### Added

src/Database/QueryBuilder/MysqlQueryBuilder.php

@@ -253,7 +253,10 @@ private function createColumnDefault(Column $column): string
             if (in_array($column->getType(), [Column::TYPE_BOOLEAN], true)) {
                 return $default . intval($column->getSettings()->getDefault());
             }
-            if (($column->getType() === Column::TYPE_TIMESTAMP || $column->getType() === Column::TYPE_DATETIME) && $column->getSettings()->getDefault() === ColumnSettings::DEFAULT_VALUE_CURRENT_TIMESTAMP) {
+            if (in_array($column->getType(), [
+                Column::TYPE_TIMESTAMP,
+                Column::TYPE_DATETIME
+            ], true) && $column->getSettings()->getDefault() === ColumnSettings::DEFAULT_VALUE_CURRENT_TIMESTAMP) {
                 if ($column->getSettings()->allowNull()) {
                     $default = ' NULL' . $default;
                 }

src/Database/QueryBuilder/PgsqlQueryBuilder.php

@@ -245,7 +245,10 @@ private function escapeDefault(Column $column): string
             $default = (string)$column->getSettings()->getDefault();
         } elseif (in_array($column->getType(), [Column::TYPE_BOOLEAN], true)) {
             $default = $column->getSettings()->getDefault() ? 'true' : 'false';
-        } elseif ($column->getType() === Column::TYPE_TIMESTAMP && $column->getSettings()->getDefault() === ColumnSettings::DEFAULT_VALUE_CURRENT_TIMESTAMP) {
+        } elseif (in_array($column->getType(), [
+            Column::TYPE_TIMESTAMP,
+            Column::TYPE_DATETIME
+        ], true) && $column->getSettings()->getDefault() === ColumnSettings::DEFAULT_VALUE_CURRENT_TIMESTAMP) {
             $default = 'CURRENT_TIMESTAMP';
         } else {
             $default = "'" . $this->sanitizeSingleQuote($column->getSettings()->getDefault()) . "'";

testing_migrations/phoenix/20150529123120_init.php

@@ -78,7 +78,7 @@ protected function up(): void
             ->addColumn('col_double', 'double', ['length' => 10, 'decimals' => 3])
             ->addColumn('col_boolean', 'boolean')
             ->addColumn('col_bit', 'bit', ['length' => 5, 'default' => "B'10101'"])
-            ->addColumn('col_datetime', 'datetime')
+            ->addColumn('col_datetime', 'datetime', ['default' => ColumnSettings::DEFAULT_VALUE_CURRENT_TIMESTAMP])
             ->addColumn('col_date', 'date')
             ->addColumn('col_enum', 'enum', ['values' => ['xxx', 'yyy', 'zzz'], 'null' => true])
             ->addColumn('col_set', 'set', ['values' => ['xxx', 'yyy', 'zzz'], 'null' => true])
@@ -87,7 +87,7 @@ protected function up(): void
             ->addColumn('col_line', 'line', ['null' => true])
             ->addColumn('col_polygon', 'polygon', ['null' => true])
             ->addColumn('col_time', 'time', ['null' => true])
-            ->addColumn('col_timestamp', 'timestamp', ['null' => true, 'default' => ColumnSettings::DEFAULT_VALUE_CURRENT_TIMESTAMP])
+            ->addColumn('col_timestamp', 'timestamp', ['default' => ColumnSettings::DEFAULT_VALUE_CURRENT_TIMESTAMP])
             ->addIndex([new IndexColumn('col_string', ['order' => 'DESC']), new IndexColumn('col_integer', ['order' => 'DESC'])])
             ->addForeignKey('col_smallinteger', 'table_5', 'id', ForeignKey::CASCADE, ForeignKey::CASCADE)
             ->create();

testing_migrations/phoenix/20150908065215_add_data.php

@@ -136,10 +136,8 @@ public function up(): void
             'col_double' => 3.1415,
             'col_decimal' => 3.1415,
             'col_numeric' => 3.1415,
-            'col_datetime' => new DateTime(),
             'col_date' => (new DateTime())->format('Y-m-d'),
             'col_time' => '20:30:40',
-            'col_timestamp' => null,
             'col_year' => 2021,
         ]);
     }