Skip to content

Commit b106f7e

Browse files
authored
Add support for decimal column type (#1739)
* Add support for `decimal` column type Previously `decimal` columns were represented with a cast. This now is no longer the case and instead the column type itself is `decimal`. This change takes that into account. * The column type may also be `numeric` * Update tests
1 parent d61d203 commit b106f7e

File tree

16 files changed

+32
-30
lines changed

16 files changed

+32
-30
lines changed

src/Console/ModelsCommand.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -584,6 +584,8 @@ public function getPropertiesFromTable($model)
584584
'float', 'real', 'float4',
585585
'double', 'float8' => 'float',
586586

587+
'decimal', 'numeric' => 'numeric',
588+
587589
default => 'string',
588590
};
589591
}

tests/Console/ModelsCommand/AllowGlobDirectory/__snapshots__/Test__test__1.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@
4242
* @property float $float_not_nullable
4343
* @property float|null $double_nullable
4444
* @property float $double_not_nullable
45-
* @property string|null $decimal_nullable
46-
* @property string $decimal_not_nullable
45+
* @property numeric|null $decimal_nullable
46+
* @property numeric $decimal_not_nullable
4747
* @property int|null $boolean_nullable
4848
* @property int $boolean_not_nullable
4949
* @property string|null $enum_nullable

tests/Console/ModelsCommand/DoesNotGeneratePhpdocWithExternalEloquentBuilder/__snapshots__/Test__test__1.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@
4848
* @property float $float_not_nullable
4949
* @property float|null $double_nullable
5050
* @property float $double_not_nullable
51-
* @property string|null $decimal_nullable
52-
* @property string $decimal_not_nullable
51+
* @property numeric|null $decimal_nullable
52+
* @property numeric $decimal_not_nullable
5353
* @property int|null $boolean_nullable
5454
* @property int $boolean_not_nullable
5555
* @property string|null $enum_nullable

tests/Console/ModelsCommand/GenerateBasicPhpDocWithEnumDefaults/__snapshots__/Test__test__1.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@
4444
* @property float $float_not_nullable
4545
* @property float|null $double_nullable
4646
* @property float $double_not_nullable
47-
* @property string|null $decimal_nullable
48-
* @property string $decimal_not_nullable
47+
* @property numeric|null $decimal_nullable
48+
* @property numeric $decimal_not_nullable
4949
* @property int|null $boolean_nullable
5050
* @property int $boolean_not_nullable
5151
* @property string|null $enum_nullable

tests/Console/ModelsCommand/GenerateBasicPhpdoc/__snapshots__/Test__test__1.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@
4242
* @property float $float_not_nullable
4343
* @property float|null $double_nullable
4444
* @property float $double_not_nullable
45-
* @property string|null $decimal_nullable
46-
* @property string $decimal_not_nullable
45+
* @property numeric|null $decimal_nullable
46+
* @property numeric $decimal_not_nullable
4747
* @property int|null $boolean_nullable
4848
* @property int $boolean_not_nullable
4949
* @property string|null $enum_nullable

tests/Console/ModelsCommand/GenerateBasicPhpdocCamel/__snapshots__/Test__test__1.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@
4242
* @property float $floatNotNullable
4343
* @property float|null $doubleNullable
4444
* @property float $doubleNotNullable
45-
* @property string|null $decimalNullable
46-
* @property string $decimalNotNullable
45+
* @property numeric|null $decimalNullable
46+
* @property numeric $decimalNotNullable
4747
* @property int|null $booleanNullable
4848
* @property int $booleanNotNullable
4949
* @property string|null $enumNullable

tests/Console/ModelsCommand/GenerateBasicPhpdocFinal/__snapshots__/Test__test__1.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@
4242
* @property float $float_not_nullable
4343
* @property float|null $double_nullable
4444
* @property float $double_not_nullable
45-
* @property string|null $decimal_nullable
46-
* @property string $decimal_not_nullable
45+
* @property numeric|null $decimal_nullable
46+
* @property numeric $decimal_not_nullable
4747
* @property int|null $boolean_nullable
4848
* @property int $boolean_not_nullable
4949
* @property string|null $enum_nullable

tests/Console/ModelsCommand/GeneratePhpdocWithExternalEloquentBuilder/__snapshots__/Test__test__1.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@
4848
* @property float $float_not_nullable
4949
* @property float|null $double_nullable
5050
* @property float $double_not_nullable
51-
* @property string|null $decimal_nullable
52-
* @property string $decimal_not_nullable
51+
* @property numeric|null $decimal_nullable
52+
* @property numeric $decimal_not_nullable
5353
* @property int|null $boolean_nullable
5454
* @property int $boolean_not_nullable
5555
* @property string|null $enum_nullable

tests/Console/ModelsCommand/GeneratePhpdocWithExternalEloquentBuilderWithFqn/__snapshots__/Test__test__1.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@
4343
* @property float $float_not_nullable
4444
* @property float|null $double_nullable
4545
* @property float $double_not_nullable
46-
* @property string|null $decimal_nullable
47-
* @property string $decimal_not_nullable
46+
* @property numeric|null $decimal_nullable
47+
* @property numeric $decimal_not_nullable
4848
* @property int|null $boolean_nullable
4949
* @property int $boolean_not_nullable
5050
* @property string|null $enum_nullable

tests/Console/ModelsCommand/GeneratePhpdocWithForcedFqn/__snapshots__/Test__test__1.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@
4444
* @property float $float_not_nullable
4545
* @property float|null $double_nullable
4646
* @property float $double_not_nullable
47-
* @property string|null $decimal_nullable
48-
* @property string $decimal_not_nullable
47+
* @property numeric|null $decimal_nullable
48+
* @property numeric $decimal_not_nullable
4949
* @property int|null $boolean_nullable
5050
* @property int $boolean_not_nullable
5151
* @property string|null $enum_nullable

0 commit comments

Comments
 (0)