Skip to content

Refactor test of columns #399

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

Merged
merged 4 commits into from
Apr 3, 2025
Merged

Refactor test of columns #399

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e5a1de8
Refactor test of columns
Tigrov Apr 1, 2025
915fc2b
Apply fixes from StyleCI
StyleCIBot Apr 1, 2025
b61a8c3
Improve
Tigrov Apr 2, 2025
e01fa48
Rename method and update CHANGELOG.md
Tigrov Apr 3, 2025
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
32 changes: 22 additions & 10 deletions src/Column/ColumnFactory.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,16 +124,7 @@
$column = parent::fromType($type, $info);

if ($column instanceof StructuredColumn) {
/** @psalm-var array|null $defaultValue */
$defaultValue = $column->getDefaultValue();

if (is_array($defaultValue)) {
foreach ($column->getColumns() as $structuredColumnName => $structuredColumn) {
if (isset($defaultValue[$structuredColumnName])) {
$structuredColumn->defaultValue($defaultValue[$structuredColumnName]);
}
}
}
$this->initStructuredDefaultValue($column);
}

return $column;
Expand Down Expand Up @@ -168,7 +159,7 @@
$value = preg_replace("/::[^:']+$/", '$1', $defaultValue);

if (str_starts_with($value, "B'") && $value[-1] === "'") {
return $column->phpTypecast(substr($value, 2, -1));

Check warning on line 162 in src/Column/ColumnFactory.php

View workflow job for this annotation

GitHub Actions / PHP 8.4-ubuntu-latest 

Escaped Mutant for Mutator "UnwrapSubstr":

@@ @@
         /** @var string $value */
         $value = preg_replace("/::[^:']+\$/", '$1', $defaultValue);
         if (str_starts_with($value, "B'") && $value[-1] === "'") {
-            return $column->phpTypecast(substr($value, 2, -1));
+            return $column->phpTypecast($value);
         }
         $value = parent::normalizeNotNullDefaultValue($value, $column);
         if ($value instanceof Expression) {

Check warning on line 162 in src/Column/ColumnFactory.php

View workflow job for this annotation

GitHub Actions / PHP 8.4-ubuntu-latest 

Escaped Mutant for Mutator "DecrementInteger":

@@ @@
         /** @var string $value */
         $value = preg_replace("/::[^:']+\$/", '$1', $defaultValue);
         if (str_starts_with($value, "B'") && $value[-1] === "'") {
-            return $column->phpTypecast(substr($value, 2, -1));
+            return $column->phpTypecast(substr($value, 1, -1));
         }
         $value = parent::normalizeNotNullDefaultValue($value, $column);
         if ($value instanceof Expression) {
}

$value = parent::normalizeNotNullDefaultValue($value, $column);
Expand All @@ -179,4 +170,25 @@

return $value;
}

/**
* Initializes the default value for structured columns.
*/
private function initStructuredDefaultValue(StructuredColumn $column): void
{
/** @psalm-var array|null $defaultValue */
$defaultValue = $column->getDefaultValue();

if (is_array($defaultValue)) {
foreach ($column->getColumns() as $structuredColumnName => $structuredColumn) {
if (isset($defaultValue[$structuredColumnName])) {
$structuredColumn->defaultValue($defaultValue[$structuredColumnName]);

if ($structuredColumn instanceof StructuredColumn) {
$this->initStructuredDefaultValue($structuredColumn);
}
}
}
}
}
}
5 changes: 3 additions & 2 deletions tests/ColumnTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,10 +277,11 @@ public function testStructuredType(): void
name: 'price_array2',
notNull: false,
columns: [
'value' => new DoubleColumn(ColumnType::DECIMAL, dbType: 'numeric', name: 'value', notNull: false, scale: 2, size: 10),
'currency_code' => new StringColumn(ColumnType::CHAR, dbType: 'bpchar', name: 'currency_code', notNull: false, size: 3),
'value' => new DoubleColumn(ColumnType::DECIMAL, dbType: 'numeric', name: 'value', notNull: false, scale: 2, size: 10, defaultValue: null),
'currency_code' => new StringColumn(ColumnType::CHAR, dbType: 'bpchar', name: 'currency_code', notNull: false, size: 3, defaultValue: null),
],
),
defaultValue: null,
),
),
$priceArray2->dbTypecast([null, null]),
Expand Down
Loading
Loading