Fix using literal type with add column (#2255)

cakephp · Jan 20, 2024 · f805b60 · f805b60
1 parent c353796
commit f805b60
Show file tree

Hide file tree

Showing 5 changed files with 71 additions and 3 deletions.
diff --git a/src/Phinx/Db/Adapter/PdoAdapter.php b/src/Phinx/Db/Adapter/PdoAdapter.php
@@ -660,10 +660,10 @@ public function getAttribute(int $attribute): mixed
      * Get the definition for a `DEFAULT` statement.
      *
      * @param mixed $default Default value
-     * @param string|null $columnType column type added
+     * @param string|\Phinx\Util\Literal|null $columnType Column type
      * @return string
      */
-    protected function getDefaultValueDefinition(mixed $default, ?string $columnType = null): string
+    protected function getDefaultValueDefinition(mixed $default, string|Literal|null $columnType = null): string
     {
         if ($default instanceof Literal) {
             $default = (string)$default;
@@ -672,7 +672,7 @@ protected function getDefaultValueDefinition(mixed $default, ?string $columnType
             $default = $this->getConnection()->quote($default);
         } elseif (is_bool($default)) {
             $default = $this->castToBool($default);
-        } elseif ($default !== null && $columnType === static::PHINX_TYPE_BOOLEAN) {
+        } elseif ($default !== null && (string)$columnType === static::PHINX_TYPE_BOOLEAN) {
             $default = $this->castToBool((bool)$default);
         }
 

diff --git a/tests/Phinx/Db/Adapter/MysqlAdapterTest.php b/tests/Phinx/Db/Adapter/MysqlAdapterTest.php
@@ -746,6 +746,23 @@ public function testAddColumnWithDefaultLiteral()
         $this->assertTrue($rows[1]['Default'] === 'CURRENT_TIMESTAMP' || $rows[1]['Default'] === 'current_timestamp()');
     }
 
+    public function testAddColumnWithLiteralTypeAndDefault()
+    {
+        $table = new Table('table1', [], $this->adapter);
+        $table->save();
+
+        $table
+            ->addColumn('checked', Literal::from('boolean'), ['default' => 0])
+            ->save();
+
+        $column = $this->adapter->getColumns('table1')[1];
+
+        $this->assertSame('checked', $column->getName());
+        $this->assertSame('boolean', $column->getType());
+        $this->assertSame('0', $column->getDefault());
+        $this->assertTrue($column->getNull());
+    }
+
     public function testAddColumnWithCustomType()
     {
         $this->adapter->setDataDomain([

diff --git a/tests/Phinx/Db/Adapter/PostgresAdapterTest.php b/tests/Phinx/Db/Adapter/PostgresAdapterTest.php
@@ -890,6 +890,23 @@ public function testAddColumnArrayType($column_name, $column_type)
         $this->assertTrue($table->hasColumn($column_name));
     }
 
+    public function testAddColumnWithLiteralTypeAndDefault()
+    {
+        $table = new Table('table1', [], $this->adapter);
+        $table->save();
+
+        $table
+            ->addColumn('checked', Literal::from('boolean'), ['default' => 0])
+            ->save();
+
+        $column = $this->adapter->getColumns('table1')[1];
+
+        $this->assertSame('checked', $column->getName());
+        $this->assertSame('boolean', $column->getType());
+        $this->assertSame('false', $column->getDefault());
+        $this->assertTrue($column->getNull());
+    }
+
     public function testAddColumnWithCustomType()
     {
         $this->adapter->setDataDomain([

diff --git a/tests/Phinx/Db/Adapter/SQLiteAdapterTest.php b/tests/Phinx/Db/Adapter/SQLiteAdapterTest.php
@@ -524,6 +524,23 @@ public function testAddColumnWithDefaultEmptyString()
         $this->assertEquals("''", $rows[1]['dflt_value']);
     }
 
+    public function testAddColumnWithLiteralTypeAndDefault()
+    {
+        $table = new Table('table1', [], $this->adapter);
+        $table->save();
+
+        $table
+            ->addColumn('checked', Literal::from('boolean'), ['default' => 0])
+            ->save();
+
+        $column = $this->adapter->getColumns('table1')[1];
+
+        $this->assertSame('checked', $column->getName());
+        $this->assertSame('boolean', $column->getType());
+        $this->assertSame(false, $column->getDefault());
+        $this->assertTrue($column->getNull());
+    }
+
     public function testAddColumnWithCustomType()
     {
         $this->adapter->setDataDomain([

diff --git a/tests/Phinx/Db/Adapter/SqlServerAdapterTest.php b/tests/Phinx/Db/Adapter/SqlServerAdapterTest.php
@@ -493,6 +493,23 @@ public function testAddColumnWithDefaultBool()
         }
     }
 
+    public function testAddColumnWithLiteralTypeAndDefault()
+    {
+        $table = new Table('table1', [], $this->adapter);
+        $table->save();
+
+        $table
+            ->addColumn('checked', Literal::from('bit'), ['default' => 0])
+            ->save();
+
+        $column = $this->adapter->getColumns('table1')['checked'];
+
+        $this->assertSame('checked', $column->getName());
+        $this->assertSame('boolean', $column->getType());
+        $this->assertSame(0, $column->getDefault());
+        $this->assertTrue($column->getNull());
+    }
+
     public function testAddColumnWithCustomType()
     {
         $this->adapter->setDataDomain([