Skip to content

fix: create column with definition only if it has its own type #378

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

Draft
ondrajodas wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

fix: create column with definition only if it has its own type #378

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
07b62f3
fix: create column with definition only if it has its own type
ondrajodas Mar 10, 2025
77e5a78
fix tests
ondrajodas Mar 10, 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
2 changes: 1 addition & 1 deletion libs/output-mapping/src/Mapping/MappingFromConfigurationSchemaColumnDataType.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ public function getBackendDefaultValue(string $backend): ?string

public function hasBackendType(string $backend): bool
{
if (!isset($this->mapping[$backend])) {
if (!isset($this->mapping[$backend]['type'])) {
return false;
}
return true;
Expand Down
5 changes: 1 addition & 4 deletions ...ut-mapping/src/Writer/Table/TableDefinitionFromSchema/TableDefinitionFromSchemaColumn.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,7 @@ public function getRequestData(): array
// $definition['default'] = $dataType->getDefaultValue($this->backend);
// }

if ($definition && !isset($definition['type'])) {
$definition['type'] = $dataType->getTypeName($this->backend);
}
if ($definition) {
if (isset($definition['type'])) {
$data['definition'] = $definition;
}
}
Expand Down
19 changes: 19 additions & 0 deletions ...ping/tests/Writer/Table/TableDefinitionFromSchema/TableDefinitionFromSchemaColumnTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,5 +169,24 @@ public function columnDataProvider(): Generator
'basetype' => 'STRING',
],
];

yield 'backend definition without type' => [
'column' => new MappingFromConfigurationSchemaColumn([
'name' => 'test_table_name',
'data_type' => [
'base' => [
'type' => 'STRING',
],
'snowflake' => [
'length' => '1024',
],
],
]),
'backend' => 'snowflake',
'expectedStructure' => [
'name' => 'test_table_name',
'basetype' => 'STRING',
],
];
}
}
1 change: 0 additions & 1 deletion libs/output-mapping/tests/Writer/TableDefinitionV2BigQueryTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,6 @@ public function configProvider(): Generator
],
'birthweight' => [
'type' => Bigquery::TYPE_NUMERIC,
'length' => '38,9',
'nullable' => true,
],
'created' => [
Expand Down
10 changes: 7 additions & 3 deletions libs/output-mapping/tests/Writer/TableDefinitionV2Test.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,7 +361,7 @@ public function configProvider(): Generator
[
'Id' => [
'type' => Snowflake::TYPE_NUMBER,
'length' => '38,0', // default integer length
'length' => '38,9', // default integer length
'nullable' => false,
],
'Name' => [
Expand Down Expand Up @@ -473,8 +473,12 @@ private static function assertDataTypeDefinition(array $definitionColumn, array
$definitionColumn = current($definitionColumn);

self::assertSame($expectedType['type'], $definitionColumn['definition']['type']);
self::assertSame($expectedType['length'], $definitionColumn['definition']['length']);
self::assertSame($expectedType['nullable'], $definitionColumn['definition']['nullable']);
if (isset($expectedType['length'])) {
self::assertSame($expectedType['length'], $definitionColumn['definition']['length']);
}
if (isset($definitionColumn['nullable'])) {
self::assertSame($expectedType['nullable'], $definitionColumn['definition']['nullable']);
}
}

#[NeedsTestTables]
Expand Down