Merge pull request #240 from kitloong/feature/current-precision

Fix #237 Generate `CURRENT_TIMESTAMP` with precision

Author: kitloong

src/Database/Models/MySQL/MySQLColumn.php

@@ -81,6 +81,8 @@ public function __construct(string $table, array $column)
             case ColumnType::TIMESTAMP:
             case ColumnType::TIMESTAMP_TZ:
                 $this->onUpdateCurrentTimestamp = $this->hasOnUpdateCurrentTimestamp();
+                $this->flattenCurrentTimestamp();
+
                 break;
 
             case ColumnType::GEOGRAPHY:
@@ -345,11 +347,27 @@ private function getMariaDBColumnDefault(?string $columnDefault): ?string
             return strtr($matches[1], self::MARIADB_ESCAPE_SEQUENCES);
         }
 
+        if (Str::startsWith($columnDefault, 'current_timestamp')) {
+            return 'CURRENT_TIMESTAMP';
+        }
+
         return match ($columnDefault) {
-            'current_timestamp()' => 'CURRENT_TIMESTAMP',
             'curdate()' => 'CURRENT_DATE',
             'curtime()' => 'CURRENT_TIME',
             default => $columnDefault,
         };
     }
+
+    private function flattenCurrentTimestamp(): void
+    {
+        if ($this->default === null) {
+            return;
+        }
+
+        if (!Str::startsWith($this->default, 'CURRENT_TIMESTAMP')) {
+            return;
+        }
+
+        $this->default = 'CURRENT_TIMESTAMP';
+    }
 }

src/Repositories/MySQLRepository.php

@@ -36,7 +36,7 @@ public function isOnUpdateCurrentTimestamp(string $table, string $column): bool
         $result = DB::selectOne(
             "SHOW COLUMNS FROM `$table`
                 WHERE Field = '$column'
-                    AND Type IN ('timestamp', 'datetime')
+                    AND (Type LIKE 'timestamp%' OR Type LIKE 'datetime%')
                     AND Extra LIKE '%on update CURRENT_TIMESTAMP%'",
         );
         return !($result === null);

tests/resources/database/migrations/general/2020_03_21_000000_expected_create_timestamps_table.php

@@ -85,10 +85,15 @@ public function up()
 
         Schema::create('use_current_on_update', function (Blueprint $table) {
             $table->increments('id');
+
+            $table->dateTime('datetime_precision_useCurrent', 2)->nullable()->useCurrent()->useCurrentOnUpdate();
+            $table->dateTime('timestamp_precision_useCurrent', 2)->nullable()->useCurrent()->useCurrentOnUpdate();
+
             $table->dateTime('datetime_useCurrentOnUpdate_nullable_useCurrent')->useCurrentOnUpdate()->nullable()->useCurrent();
             $table->dateTime('datetime_useCurrentOnUpdate_useCurrent')->useCurrentOnUpdate()->useCurrent();
             $table->dateTime('datetime_nullable')->useCurrentOnUpdate()->nullable();
             $table->dateTime('datetime_useCurrent')->useCurrent();
+
             $table->timestamp('timestamp_useCurrentOnUpdate_nullable_useCurrent')->useCurrentOnUpdate()->nullable()->useCurrent();
             $table->timestamp('timestamp_useCurrentOnUpdate_useCurrent')->useCurrentOnUpdate()->useCurrent();
             $table->timestamp('timestamp_nullable')->useCurrentOnUpdate()->nullable();