Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Refactoring of AbstractSchema::getColumnPhpType() method #728

Merged
merged 2 commits into from
Jul 24, 2023
Merged

Refactoring of AbstractSchema::getColumnPhpType() method #728

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
baeb0b1
Refactoring of `AbstractSchema::getColumnPhpType()` method
Tigrov Jul 22, 2023
8a8ec24
Update CHANGELOG.md
samdark Jul 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
## 1.0.1 under development

- Chg #722: Remove legacy array syntax for typecast. Use `Param` instead (@terabytesoftw)
- Chg #724: Typecast refactoring. (@Tigrov)
- Chg #724: Typecast refactoring (@Tigrov)
- Chg #728: Refactor `AbstractSchema::getColumnPhpType()` (@Tigrov)

## 1.0.0 April 12, 2023

Expand Down
30 changes: 9 additions & 21 deletions src/Schema/AbstractSchema.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -402,36 +402,24 @@ protected function findTableNames(string $schema): array
*/
protected function getColumnPhpType(ColumnSchemaInterface $column): string
{
/** @psalm-var string[] $typeMap */
$typeMap = [
return match ($column->getType()) {
// abstract type => php type
SchemaInterface::TYPE_TINYINT => SchemaInterface::PHP_TYPE_INTEGER,
SchemaInterface::TYPE_SMALLINT => SchemaInterface::PHP_TYPE_INTEGER,
SchemaInterface::TYPE_INTEGER => SchemaInterface::PHP_TYPE_INTEGER,
SchemaInterface::TYPE_BIGINT => SchemaInterface::PHP_TYPE_INTEGER,
SchemaInterface::TYPE_INTEGER => PHP_INT_SIZE === 4 && $column->isUnsigned()
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This behavior is for all dbms or is specific, i find it strange.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In PHP for 32bit system maximum integer number is 2147483647. Seems, in most (maybe in all) DBMS unsigned int value will be more (for example in MySQL — 4294967295).

? SchemaInterface::PHP_TYPE_STRING
: SchemaInterface::PHP_TYPE_INTEGER,
SchemaInterface::TYPE_BIGINT => PHP_INT_SIZE === 8 && !$column->isUnsigned()
? SchemaInterface::PHP_TYPE_INTEGER
: SchemaInterface::PHP_TYPE_STRING,
SchemaInterface::TYPE_BOOLEAN => SchemaInterface::PHP_TYPE_BOOLEAN,
SchemaInterface::TYPE_DECIMAL => SchemaInterface::PHP_TYPE_DOUBLE,
SchemaInterface::TYPE_FLOAT => SchemaInterface::PHP_TYPE_DOUBLE,
SchemaInterface::TYPE_DOUBLE => SchemaInterface::PHP_TYPE_DOUBLE,
SchemaInterface::TYPE_BINARY => SchemaInterface::PHP_TYPE_RESOURCE,
SchemaInterface::TYPE_JSON => SchemaInterface::PHP_TYPE_ARRAY,
];

if (isset($typeMap[$column->getType()])) {
if ($column->getType() === SchemaInterface::TYPE_BIGINT) {
return PHP_INT_SIZE === 8 && !$column->isUnsigned()
? SchemaInterface::PHP_TYPE_INTEGER : SchemaInterface::PHP_TYPE_STRING;
}

if ($column->getType() === SchemaInterface::TYPE_INTEGER) {
return PHP_INT_SIZE === 4 && $column->isUnsigned()
? SchemaInterface::PHP_TYPE_STRING : SchemaInterface::PHP_TYPE_INTEGER;
}

return $typeMap[$column->getType()];
}

return SchemaInterface::PHP_TYPE_STRING;
default => SchemaInterface::PHP_TYPE_STRING,
};
}

/**
Expand Down
Loading