Improve precision and scale behavior across adapters

Author: MasterOdin

src/Phinx/Db/Adapter/MysqlAdapter.php

@@ -956,9 +956,10 @@ public function getSqlType(Literal|string $type, ?int $limit = null): array
     {
         $type = (string)$type;
         switch ($type) {
+            case static::PHINX_TYPE_DECIMAL:
+                return ['name' => $type, 'precision' => 10, 'scale' => 0];
             case static::PHINX_TYPE_FLOAT:
             case static::PHINX_TYPE_DOUBLE:
-            case static::PHINX_TYPE_DECIMAL:
             case static::PHINX_TYPE_DATE:
             case static::PHINX_TYPE_ENUM:
             case static::PHINX_TYPE_SET:
@@ -1355,8 +1356,12 @@ protected function getColumnSqlDefinition(Column $column): string
             $sqlType = $this->getSqlType($column->getType(), $column->getLimit());
             $def = strtoupper($sqlType['name']);
         }
-        if ($column->getPrecision() && $column->getScale() !== null) {
-            $def .= '(' . $column->getPrecision() . ',' . $column->getScale() . ')';
+        if ($column->getPrecision() || $column->getScale()) {
+            $def .= sprintf(
+                '(%s, %s)',
+                $column->getPrecision() ?: $sqlType['precision'],
+                $column->getScale() ?: $sqlType['scale'],
+            );
         } elseif (isset($sqlType['limit'])) {
             $def .= '(' . $sqlType['limit'] . ')';
         }

src/Phinx/Db/Adapter/SqlServerAdapter.php

@@ -1063,8 +1063,9 @@ public function getSqlType(Literal|string $type, ?int $limit = null): array
     {
         $type = (string)$type;
         switch ($type) {
-            case static::PHINX_TYPE_FLOAT:
             case static::PHINX_TYPE_DECIMAL:
+                return ['name' => $type, 'precision' => 18, 'scale' => 0];
+            case static::PHINX_TYPE_FLOAT:
             case static::PHINX_TYPE_DATETIME:
             case static::PHINX_TYPE_TIME:
             case static::PHINX_TYPE_DATE:
@@ -1237,7 +1238,7 @@ protected function getColumnSqlDefinition(Column $column, bool $create = true):
                 'tinyint',
                 'smallint',
             ];
-            if ($sqlType['name'] === static::PHINX_TYPE_DECIMAL && $column->getPrecision() && $column->getScale()) {
+            if ($sqlType['name'] === static::PHINX_TYPE_DECIMAL && ($column->getPrecision() || $column->getScale())) {
                 $buffer[] = sprintf(
                     '(%s, %s)',
                     $column->getPrecision() ?: $sqlType['precision'],

tests/Phinx/Db/Adapter/MysqlAdapterTest.php

@@ -1389,8 +1389,9 @@ public function columnsProvider()
             ['column6', 'float', []],
             ['column7', 'decimal', []],
             ['decimal_precision_scale', 'decimal', ['precision' => 10, 'scale' => 2]],
+            ['decimal_precision_zero_scale', 'decimal', ['precision' => 15, 'scale' => 0]],
             ['decimal_limit', 'decimal', ['limit' => 10]],
-            ['decimal_precision', 'decimal', ['precision' => 10]],
+            ['decimal_precision', 'decimal', ['precision' => 15]],
             ['column8', 'datetime', []],
             ['column9', 'time', []],
             ['column10', 'timestamp', []],
@@ -2727,21 +2728,6 @@ public function testCreateTableWithPrecisionCurrentTimestamp()
         $this->assertEqualsIgnoringCase('CURRENT_TIMESTAMP(3)', $colDef['COLUMN_DEFAULT']);
     }
 
-    public function testCreateTableWithZeroScale(): void
-    {
-        $this->adapter->connect();
-        $table = new Table('test_table', ['id' => false], $this->adapter);
-        $table
-            ->addColumn('col_1', 'decimal', ['null' => false, 'precision' => 15, 'scale' => 0])
-            ->create();
-
-        $columns = $table->getColumns();
-        $this->assertCount(1, $columns);
-        $this->assertSame('col_1', $columns[0]->getName());
-        $this->assertSame(15, $columns[0]->getPrecision());
-        $this->assertSame(0, $columns[0]->getScale());
-    }
-
     public function pdoAttributeProvider()
     {
         return [

tests/Phinx/Db/Adapter/PostgresAdapterTest.php

@@ -1258,6 +1258,7 @@ public function columnsProvider()
             ['column13', 'string', ['limit' => 10]],
             ['column16', 'interval', []],
             ['decimal_precision_scale', 'decimal', ['precision' => 10, 'scale' => 2]],
+            ['decimal_precision_zero_scale', 'decimal', ['precision' => 12, 'scale' => 0]],
             ['decimal_limit', 'decimal', ['limit' => 10]],
             ['decimal_precision', 'decimal', ['precision' => 10]],
         ];
@@ -1284,6 +1285,18 @@ public function testGetColumns($colName, $type, $options, $actualType = null)
         } else {
             $this->assertEquals(['name' => $actualType] + $options, $columns[1]->getType());
         }
+
+        if (isset($options['limit'])) {
+            $this->assertEquals($options['limit'], $columns[1]->getLimit());
+        }
+
+        if (isset($options['precision'])) {
+            $this->assertEquals($options['precision'], $columns[1]->getPrecision());
+        }
+
+        if (isset($options['scale'])) {
+            $this->assertEquals($options['scale'], $columns[1]->getScale());
+        }
     }
 
     /**

tests/Phinx/Db/Adapter/SqlServerAdapterTest.php

@@ -709,6 +709,7 @@ public function columnsProvider()
             ['column13', 'tinyinteger', ['default' => 5]],
             ['column14', 'smallinteger', ['default' => 5]],
             ['decimal_precision_scale', 'decimal', ['precision' => 10, 'scale' => 2]],
+            ['decimal_precision_zero_scale', 'decimal', ['precision' => 10, 'scale' => 0]],
             ['decimal_limit', 'decimal', ['limit' => 10]],
             ['decimal_precision', 'decimal', ['precision' => 10]],
         ];
@@ -728,6 +729,18 @@ public function testGetColumns($colName, $type, $options)
         $this->assertCount(2, $columns);
         $this->assertEquals($colName, $columns[$colName]->getName());
         $this->assertEquals($type, $columns[$colName]->getType());
+
+        if (isset($options['limit'])) {
+            $this->assertEquals($options['limit'], $columns[1]->getLimit());
+        }
+
+        if (isset($options['precision'])) {
+            $this->assertEquals($options['precision'], $columns[1]->getPrecision());
+        }
+
+        if (isset($options['scale'])) {
+            $this->assertEquals($options['scale'], $columns[1]->getScale());
+        }
     }
 
     public function testAddIndex()