Generate now() as useCurrent() #39

Author: kitloong

src/KitLoong/MigrationsGenerator/Generators/DatetimeField.php

@@ -88,6 +88,8 @@ public function makeDefault(Column $column): string
     {
         if (in_array($column->getDefault(), ['CURRENT_TIMESTAMP'], true)) {
             return ColumnModifier::USE_CURRENT;
+        } elseif ($column->getDefault() === 'now()') { // For PgSQL
+            return ColumnModifier::USE_CURRENT;
         } else {
             $default = $this->decorator->columnDefaultToString($column->getDefault());
             return $this->decorator->decorate(ColumnModifier::DEFAULT, [$default]);

tests/KitLoong/Feature/PgSQL/CommandTest.php

@@ -7,6 +7,7 @@
 
 namespace Tests\KitLoong\Feature\PgSQL;
 
+use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\File;
 use Illuminate\Support\Str;
 
@@ -16,13 +17,28 @@ public function testRun()
     {
         $migrateTemplates = function () {
             $this->migrateGeneral('pgsql');
+
+            // Test timestamp default now()
+            DB::statement("ALTER TABLE all_columns_pgsql ADD COLUMN timestamp_defaultnow timestamp(0) without time zone DEFAULT now() NOT NULL");
         };
 
         $generateMigrations = function () {
             $this->generateMigrations();
         };
 
-        $this->verify($migrateTemplates, $generateMigrations);
+        $beforeVerify = function () {
+            $this->assertLineExistsThenReplace(
+                $this->storageSql('actual.sql'),
+                'timestamp_defaultnow timestamp(0) without time zone DEFAULT CURRENT_TIMESTAMP NOT NULL'
+            );
+
+            $this->assertLineExistsThenReplace(
+                $this->storageSql('expected.sql'),
+                'timestamp_defaultnow timestamp(0) without time zone DEFAULT now() NOT NULL'
+            );
+        };
+
+        $this->verify($migrateTemplates, $generateMigrations, $beforeVerify);
     }
 
     public function testCollation()
@@ -38,7 +54,7 @@ public function testCollation()
         $this->verify($migrateTemplates, $generateMigrations);
     }
 
-    public function verify(callable $migrateTemplates, callable $generateMigrations)
+    public function verify(callable $migrateTemplates, callable $generateMigrations, callable $beforeVerify = null)
     {
         $migrateTemplates();
 
@@ -64,9 +80,25 @@ public function verify(callable $migrateTemplates, callable $generateMigrations)
         $this->truncateMigration();
         $this->dumpSchemaAs($this->storageSql('actual.sql'));
 
+        $beforeVerify === null ?: $beforeVerify();
+
         $this->assertFileEqualsIgnoringOrder(
             $this->storageSql('expected.sql'),
             $this->storageSql('actual.sql')
         );
     }
+
+    private function assertLineExistsThenReplace(string $file, string $line)
+    {
+        $this->assertTrue(str_contains(
+            file_get_contents($file),
+            $line
+        ));
+
+        File::put($file, str_replace(
+            $line,
+            'replaced',
+            file_get_contents($file)
+        ));
+    }
 }