Use StringColumn for decimal type by default (#1125)

Author: vjik

CHANGELOG.md

@@ -41,7 +41,7 @@
 - Enh #865: Raise minimum PHP version to `^8.1` with minor refactoring (@Tigrov, @vjik)
 - Enh #798: Allow `QueryInterface::one()` and `QueryInterface::all()` to return objects (@darkdef, @Tigrov)
 - Enh #872: Use `#[\SensitiveParameter]` attribute to mark sensitive parameters (@heap-s)
-- New #864, #897, #898, #950, #1009: Realize column factory (@Tigrov, @vjik)
+- New #864, #897, #898, #950, #1009, #1125: Realize column factory (@Tigrov, @vjik)
 - Enh #875: Ignore "Packets out of order..." warnings in `AbstractPdoCommand::internalExecute()` method (@Tigrov)
 - Enh #877: Separate column type constants (@Tigrov)
 - New #878, #1095: Realize `ColumnBuilder` class (@Tigrov, @vjik)

src/Schema/Column/AbstractColumnFactory.php

@@ -243,7 +243,7 @@ protected function getColumnClass(string $type, array $info = []): string
             ColumnType::BIGINT => PHP_INT_SIZE !== 8 || !empty($info['unsigned'])
                 ? BigIntColumn::class
                 : IntegerColumn::class,
-            ColumnType::DECIMAL => DoubleColumn::class,
+            ColumnType::DECIMAL => StringColumn::class,
             ColumnType::FLOAT => DoubleColumn::class,
             ColumnType::DOUBLE => DoubleColumn::class,
             ColumnType::BINARY => BinaryColumn::class,

tests/Common/CommonCommandTest.php

@@ -2103,27 +2103,27 @@ protected function internalExecute(): void {}
 
     public function testDecimalValue(): void
     {
-        $decimalValue = 10.0;
         $db = $this->getSharedConnection();
         $this->loadFixture();
 
-        $inserted = $db->createCommand()
+        $inserted = $db
+            ->createCommand()
             ->insertReturningPks(
                 '{{%order}}',
-                ['customer_id' => 1, 'created_at' => 0, 'total' => $decimalValue],
+                ['customer_id' => 1, 'created_at' => 0, 'total' => 10.0],
             );
 
-        $result = $db->createCommand(
-            'select * from {{%order}} where [[id]]=:id',
-            ['id' => $inserted['id']],
-        )->queryOne();
+        $result = $db
+            ->createCommand(
+                'select * from {{%order}} where [[id]]=:id',
+                ['id' => $inserted['id']],
+            )
+            ->queryOne();
 
         $column = $db->getTableSchema('{{%order}}')->getColumn('total');
         $phpTypecastValue = $column->phpTypecast($result['total']);
 
-        $this->assertSame($decimalValue, $phpTypecastValue);
-
-        $db->close();
+        $this->assertSame('10', $phpTypecastValue);
     }
 
     public function testInsertReturningPksEmptyValues()
@@ -2179,9 +2179,9 @@ public function testInsertReturningPksWithPhpTypecasting(): void
 
         $result = $db->createCommand()
             ->withPhpTypecasting()
-            ->insertReturningPks('notauto_pk', ['id_1' => 1, 'id_2' => 2.5, 'type' => 'test1']);
+            ->insertReturningPks('notauto_pk', ['id_1' => 1, 'id_2' => '2.5', 'type' => 'test1']);
 
-        $this->assertSame(['id_1' => 1, 'id_2' => 2.5], $result);
+        $this->assertSame(['id_1' => 1, 'id_2' => '2.5'], $result);
 
         $db->close();
     }
@@ -2333,21 +2333,21 @@ public function testUpsertReturningPksWithPhpTypecasting(): void
 
         $result = $db->createCommand()
             ->withPhpTypecasting()
-            ->upsertReturningPks('notauto_pk', ['id_1' => 1, 'id_2' => 2.5, 'type' => 'test1']);
+            ->upsertReturningPks('notauto_pk', ['id_1' => 1, 'id_2' => '2.5', 'type' => 'test1']);
 
-        $this->assertSame(['id_1' => 1, 'id_2' => 2.5], $result);
+        $this->assertSame(['id_1' => 1, 'id_2' => '2.5'], $result);
 
         $result = $db->createCommand()
             ->withPhpTypecasting()
-            ->upsertReturningPks('notauto_pk', ['id_1' => 2, 'id_2' => 2.5, 'type' => 'test2']);
+            ->upsertReturningPks('notauto_pk', ['id_1' => 2, 'id_2' => '2.5', 'type' => 'test2']);
 
-        $this->assertSame(['id_1' => 2, 'id_2' => 2.5], $result);
+        $this->assertSame(['id_1' => 2, 'id_2' => '2.5'], $result);
 
         $result = $db->createCommand()
             ->withPhpTypecasting()
-            ->upsertReturningPks('notauto_pk', ['id_1' => 2, 'id_2' => 2.5, 'type' => 'test3']);
+            ->upsertReturningPks('notauto_pk', ['id_1' => 2, 'id_2' => '2.5', 'type' => 'test3']);
 
-        $this->assertSame(['id_1' => 2, 'id_2' => 2.5], $result);
+        $this->assertSame(['id_1' => 2, 'id_2' => '2.5'], $result);
 
         $db->close();
     }

tests/Provider/ColumnFactoryProvider.php

@@ -29,7 +29,7 @@ public static function definitions(): array
             'text' => ['text', new StringColumn(ColumnType::TEXT, dbType: 'text')],
             'text NOT NULL' => ['text NOT NULL', new StringColumn(ColumnType::TEXT, dbType: 'text', notNull: true)],
             'char(1)' => ['char(1)', new StringColumn(ColumnType::CHAR, dbType: 'char', size: 1)],
-            'decimal(10,2)' => ['decimal(10,2)', new DoubleColumn(ColumnType::DECIMAL, dbType: 'decimal', size: 10, scale: 2)],
+            'decimal(10,2)' => ['decimal(10,2)', new StringColumn(ColumnType::DECIMAL, dbType: 'decimal', scale: 2, size: 10)],
             'bigint UNSIGNED' => ['bigint UNSIGNED', new BigIntColumn(dbType: 'bigint', unsigned: true)],
             'integer[]' => ['integer[]', new ArrayColumn(dbType: 'integer', column: new IntegerColumn(dbType: 'integer'))],
             'string(126)[][]' => ['string(126)[][]', new ArrayColumn(size: 126, dimension: 2, column: new StringColumn(size: 126))],
@@ -65,7 +65,7 @@ public static function types(): array
             'bigint' => [ColumnType::BIGINT, ColumnType::BIGINT, IntegerColumn::class],
             'float' => [ColumnType::FLOAT, ColumnType::FLOAT, DoubleColumn::class],
             'double' => [ColumnType::DOUBLE, ColumnType::DOUBLE, DoubleColumn::class],
-            'decimal' => [ColumnType::DECIMAL, ColumnType::DECIMAL, DoubleColumn::class],
+            'decimal' => [ColumnType::DECIMAL, ColumnType::DECIMAL, StringColumn::class],
             'money' => [ColumnType::MONEY, ColumnType::MONEY, StringColumn::class],
             'timestamp' => [ColumnType::TIMESTAMP, ColumnType::TIMESTAMP, DateTimeColumn::class],
             'datetime' => [ColumnType::DATETIME, ColumnType::DATETIME, DateTimeColumn::class],