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

Refactor AbstractSchema::getDataType() #786

Merged
merged 3 commits into from
Nov 26, 2023
Merged

Refactor AbstractSchema::getDataType() #786

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
708f6a2
Refactor `AbstractSchema::getDataType()`
Tigrov Nov 26, 2023
dbb35ec
Add line to CHANGELOG.md
Tigrov Nov 26, 2023
5854fb7
Merge branch 'master' into refactor-getDataType
vjik Nov 26, 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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
`DbArrayHelper::populate()` methods to `array[]` (@vjik)
- Enh #779: Specify populate closure type in `BatchQueryResultInterface` (@vjik)
- Enh #778: Deprecate unnecessary argument `$rawSql` of `AbstractCommand::internalExecute()` (@Tigrov)
- Enh #786: Refactor `AbstractSchema::getDataType()` (@Tigrov)

## 1.2.0 November 12, 2023

Expand Down
11 changes: 3 additions & 8 deletions src/Schema/AbstractSchema.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,19 +133,14 @@ public function getDefaultSchema(): string|null

public function getDataType(mixed $data): int
{
/** @psalm-var array<string, int> $typeMap */
$typeMap = [
return match (gettype($data)) {
// php type => SQL data type
SchemaInterface::PHP_TYPE_BOOLEAN => DataType::BOOLEAN,
SchemaInterface::PHP_TYPE_INTEGER => DataType::INTEGER,
SchemaInterface::PHP_TYPE_STRING => DataType::STRING,
SchemaInterface::PHP_TYPE_RESOURCE => DataType::LOB,
SchemaInterface::PHP_TYPE_NULL => DataType::NULL,
];

$type = gettype($data);

return $typeMap[$type] ?? DataType::STRING;
default => DataType::STRING,
};
}

public function getRawTableName(string $name): string
Expand Down
Loading