From 4e2279df72f426dfb7eba372ebeaf52d45591f46 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=BDborn=C3=BD=20Adam?= Date: Thu, 8 Aug 2024 16:10:12 +0200 Subject: [PATCH 1/3] Update db-extractor-common to generate base types for custom queries --- composer.lock | 12 +-- .../out/tables/in.c-main.special.csv.manifest | 10 ++- .../out/tables/in.c-main.special.csv.manifest | 10 ++- .../out/tables/in.c-main.special.csv.manifest | 10 ++- .../out/tables/in.c-main.special.csv.manifest | 10 ++- .../out/tables/in.c-main.sales.csv.manifest | 50 ++++++++++- .../out/tables/in.c-main.special.csv.manifest | 10 ++- .../out/tables/in.c-main.sales.csv.manifest | 86 ++++++++++++++++--- .../out/tables/in.c-main.sales.csv.manifest | 50 ++++++++++- .../out/tables/in.c-main.sales.csv.manifest | 50 ++++++++++- .../out/tables/in.c-main.sales.csv.manifest | 50 ++++++++++- .../out/tables/in.c-main.sales.csv.manifest | 50 ++++++++++- .../out/tables/in.c-main.sales.csv.manifest | 50 ++++++++++- .../out/tables/in.c-main.sales.csv.manifest | 50 ++++++++++- .../out/tables/in.c-main.sales.csv.manifest | 50 ++++++++++- .../out/tables/in.c-main.sales.csv.manifest | 50 ++++++++++- tests/phpunit/MSSQLTest.php | 48 +++++++++++ 17 files changed, 613 insertions(+), 33 deletions(-) diff --git a/composer.lock b/composer.lock index ec7b1b2..85bb912 100644 --- a/composer.lock +++ b/composer.lock @@ -229,16 +229,16 @@ }, { "name": "keboola/db-extractor-common", - "version": "17.0.8", + "version": "17.0.9", "source": { "type": "git", "url": "https://github.com/keboola/db-extractor-common.git", - "reference": "2e2b8763c853938406e6cba64aeaf6760bdaddff" + "reference": "bf717f0a1d2211c16a46cf6a7f589ecf6488c33b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/keboola/db-extractor-common/zipball/2e2b8763c853938406e6cba64aeaf6760bdaddff", - "reference": "2e2b8763c853938406e6cba64aeaf6760bdaddff", + "url": "https://api.github.com/repos/keboola/db-extractor-common/zipball/bf717f0a1d2211c16a46cf6a7f589ecf6488c33b", + "reference": "bf717f0a1d2211c16a46cf6a7f589ecf6488c33b", "shasum": "" }, "require": { @@ -299,9 +299,9 @@ ], "description": "Common library from Keboola Database Extractors", "support": { - "source": "https://github.com/keboola/db-extractor-common/tree/17.0.8" + "source": "https://github.com/keboola/db-extractor-common/tree/17.0.9" }, - "time": "2024-07-23T09:18:14+00:00" + "time": "2024-08-08T14:02:59+00:00" }, { "name": "keboola/db-extractor-config", diff --git a/tests/functional/bcp-disabled/expected/data/out/tables/in.c-main.special.csv.manifest b/tests/functional/bcp-disabled/expected/data/out/tables/in.c-main.special.csv.manifest index 653dcc2..9e7adbc 100644 --- a/tests/functional/bcp-disabled/expected/data/out/tables/in.c-main.special.csv.manifest +++ b/tests/functional/bcp-disabled/expected/data/out/tables/in.c-main.special.csv.manifest @@ -11,6 +11,10 @@ "key": "KBC.datatype.nullable", "value": true }, + { + "key": "KBC.datatype.basetype", + "value": "STRING" + }, { "key": "KBC.sourceName", "value": "col1" @@ -29,6 +33,10 @@ "key": "KBC.datatype.nullable", "value": true }, + { + "key": "KBC.datatype.basetype", + "value": "STRING" + }, { "key": "KBC.sourceName", "value": "col2" @@ -43,4 +51,4 @@ } ] } -} \ No newline at end of file +} diff --git a/tests/functional/clause-with-single-quote/expected/data/out/tables/in.c-main.special.csv.manifest b/tests/functional/clause-with-single-quote/expected/data/out/tables/in.c-main.special.csv.manifest index 5339a23..4693227 100644 --- a/tests/functional/clause-with-single-quote/expected/data/out/tables/in.c-main.special.csv.manifest +++ b/tests/functional/clause-with-single-quote/expected/data/out/tables/in.c-main.special.csv.manifest @@ -11,6 +11,10 @@ "key": "KBC.datatype.nullable", "value": true }, + { + "key": "KBC.datatype.basetype", + "value": "STRING" + }, { "key": "KBC.sourceName", "value": "usergender" @@ -29,6 +33,10 @@ "key": "KBC.datatype.nullable", "value": true }, + { + "key": "KBC.datatype.basetype", + "value": "STRING" + }, { "key": "KBC.sourceName", "value": "sku" @@ -43,4 +51,4 @@ } ] } -} \ No newline at end of file +} diff --git a/tests/functional/different-quoting/expected/data/out/tables/in.c-main.special.csv.manifest b/tests/functional/different-quoting/expected/data/out/tables/in.c-main.special.csv.manifest index 5339a23..4693227 100644 --- a/tests/functional/different-quoting/expected/data/out/tables/in.c-main.special.csv.manifest +++ b/tests/functional/different-quoting/expected/data/out/tables/in.c-main.special.csv.manifest @@ -11,6 +11,10 @@ "key": "KBC.datatype.nullable", "value": true }, + { + "key": "KBC.datatype.basetype", + "value": "STRING" + }, { "key": "KBC.sourceName", "value": "usergender" @@ -29,6 +33,10 @@ "key": "KBC.datatype.nullable", "value": true }, + { + "key": "KBC.datatype.basetype", + "value": "STRING" + }, { "key": "KBC.sourceName", "value": "sku" @@ -43,4 +51,4 @@ } ] } -} \ No newline at end of file +} diff --git a/tests/functional/no-lock-advanced-query-config-row/expected/data/out/tables/in.c-main.special.csv.manifest b/tests/functional/no-lock-advanced-query-config-row/expected/data/out/tables/in.c-main.special.csv.manifest index 653dcc2..9e7adbc 100644 --- a/tests/functional/no-lock-advanced-query-config-row/expected/data/out/tables/in.c-main.special.csv.manifest +++ b/tests/functional/no-lock-advanced-query-config-row/expected/data/out/tables/in.c-main.special.csv.manifest @@ -11,6 +11,10 @@ "key": "KBC.datatype.nullable", "value": true }, + { + "key": "KBC.datatype.basetype", + "value": "STRING" + }, { "key": "KBC.sourceName", "value": "col1" @@ -29,6 +33,10 @@ "key": "KBC.datatype.nullable", "value": true }, + { + "key": "KBC.datatype.basetype", + "value": "STRING" + }, { "key": "KBC.sourceName", "value": "col2" @@ -43,4 +51,4 @@ } ] } -} \ No newline at end of file +} diff --git a/tests/functional/no-lock/expected/data/out/tables/in.c-main.sales.csv.manifest b/tests/functional/no-lock/expected/data/out/tables/in.c-main.sales.csv.manifest index 427a98b..07aa083 100644 --- a/tests/functional/no-lock/expected/data/out/tables/in.c-main.sales.csv.manifest +++ b/tests/functional/no-lock/expected/data/out/tables/in.c-main.sales.csv.manifest @@ -21,6 +21,10 @@ "key": "KBC.datatype.nullable", "value": true }, + { + "key": "KBC.datatype.basetype", + "value": "STRING" + }, { "key": "KBC.sourceName", "value": "usergender" @@ -39,6 +43,10 @@ "key": "KBC.datatype.nullable", "value": true }, + { + "key": "KBC.datatype.basetype", + "value": "STRING" + }, { "key": "KBC.sourceName", "value": "usercity" @@ -57,6 +65,10 @@ "key": "KBC.datatype.nullable", "value": true }, + { + "key": "KBC.datatype.basetype", + "value": "STRING" + }, { "key": "KBC.sourceName", "value": "usersentiment" @@ -75,6 +87,10 @@ "key": "KBC.datatype.nullable", "value": true }, + { + "key": "KBC.datatype.basetype", + "value": "STRING" + }, { "key": "KBC.sourceName", "value": "zipcode" @@ -93,6 +109,10 @@ "key": "KBC.datatype.nullable", "value": true }, + { + "key": "KBC.datatype.basetype", + "value": "STRING" + }, { "key": "KBC.sourceName", "value": "sku" @@ -111,6 +131,10 @@ "key": "KBC.datatype.nullable", "value": true }, + { + "key": "KBC.datatype.basetype", + "value": "STRING" + }, { "key": "KBC.sourceName", "value": "createdat" @@ -129,6 +153,10 @@ "key": "KBC.datatype.nullable", "value": true }, + { + "key": "KBC.datatype.basetype", + "value": "STRING" + }, { "key": "KBC.sourceName", "value": "category" @@ -147,6 +175,10 @@ "key": "KBC.datatype.nullable", "value": true }, + { + "key": "KBC.datatype.basetype", + "value": "STRING" + }, { "key": "KBC.sourceName", "value": "price" @@ -165,6 +197,10 @@ "key": "KBC.datatype.nullable", "value": true }, + { + "key": "KBC.datatype.basetype", + "value": "STRING" + }, { "key": "KBC.sourceName", "value": "county" @@ -183,6 +219,10 @@ "key": "KBC.datatype.nullable", "value": true }, + { + "key": "KBC.datatype.basetype", + "value": "STRING" + }, { "key": "KBC.sourceName", "value": "countycode" @@ -201,6 +241,10 @@ "key": "KBC.datatype.nullable", "value": true }, + { + "key": "KBC.datatype.basetype", + "value": "STRING" + }, { "key": "KBC.sourceName", "value": "userstate" @@ -219,6 +263,10 @@ "key": "KBC.datatype.nullable", "value": true }, + { + "key": "KBC.datatype.basetype", + "value": "STRING" + }, { "key": "KBC.sourceName", "value": "categorygroup" @@ -233,4 +281,4 @@ } ] } -} \ No newline at end of file +} diff --git a/tests/functional/pdo-fallback/expected/data/out/tables/in.c-main.special.csv.manifest b/tests/functional/pdo-fallback/expected/data/out/tables/in.c-main.special.csv.manifest index 653dcc2..9e7adbc 100644 --- a/tests/functional/pdo-fallback/expected/data/out/tables/in.c-main.special.csv.manifest +++ b/tests/functional/pdo-fallback/expected/data/out/tables/in.c-main.special.csv.manifest @@ -11,6 +11,10 @@ "key": "KBC.datatype.nullable", "value": true }, + { + "key": "KBC.datatype.basetype", + "value": "STRING" + }, { "key": "KBC.sourceName", "value": "col1" @@ -29,6 +33,10 @@ "key": "KBC.datatype.nullable", "value": true }, + { + "key": "KBC.datatype.basetype", + "value": "STRING" + }, { "key": "KBC.sourceName", "value": "col2" @@ -43,4 +51,4 @@ } ] } -} \ No newline at end of file +} diff --git a/tests/functional/run-action-native-types-manifest/expected/data/out/tables/in.c-main.sales.csv.manifest b/tests/functional/run-action-native-types-manifest/expected/data/out/tables/in.c-main.sales.csv.manifest index b4c76fc..0f3c21d 100644 --- a/tests/functional/run-action-native-types-manifest/expected/data/out/tables/in.c-main.sales.csv.manifest +++ b/tests/functional/run-action-native-types-manifest/expected/data/out/tables/in.c-main.sales.csv.manifest @@ -10,7 +10,12 @@ "KBC.sanitizedName": "usergender", "KBC.uniqueKey": false }, - "name": "usergender" + "name": "usergender", + "data_type": { + "base": { + "type": "STRING" + } + } }, { "nullable": true, @@ -20,7 +25,12 @@ "KBC.sanitizedName": "usercity", "KBC.uniqueKey": false }, - "name": "usercity" + "name": "usercity", + "data_type": { + "base": { + "type": "STRING" + } + } }, { "nullable": true, @@ -30,7 +40,12 @@ "KBC.sanitizedName": "usersentiment", "KBC.uniqueKey": false }, - "name": "usersentiment" + "name": "usersentiment", + "data_type": { + "base": { + "type": "STRING" + } + } }, { "nullable": true, @@ -40,7 +55,12 @@ "KBC.sanitizedName": "zipcode", "KBC.uniqueKey": false }, - "name": "zipcode" + "name": "zipcode", + "data_type": { + "base": { + "type": "STRING" + } + } }, { "nullable": true, @@ -50,7 +70,12 @@ "KBC.sanitizedName": "sku", "KBC.uniqueKey": false }, - "name": "sku" + "name": "sku", + "data_type": { + "base": { + "type": "STRING" + } + } }, { "nullable": true, @@ -60,7 +85,12 @@ "KBC.sanitizedName": "createdat", "KBC.uniqueKey": false }, - "name": "createdat" + "name": "createdat", + "data_type": { + "base": { + "type": "STRING" + } + } }, { "nullable": true, @@ -70,7 +100,12 @@ "KBC.sanitizedName": "category", "KBC.uniqueKey": false }, - "name": "category" + "name": "category", + "data_type": { + "base": { + "type": "STRING" + } + } }, { "nullable": true, @@ -80,7 +115,12 @@ "KBC.sanitizedName": "price", "KBC.uniqueKey": false }, - "name": "price" + "name": "price", + "data_type": { + "base": { + "type": "STRING" + } + } }, { "nullable": true, @@ -90,7 +130,12 @@ "KBC.sanitizedName": "county", "KBC.uniqueKey": false }, - "name": "county" + "name": "county", + "data_type": { + "base": { + "type": "STRING" + } + } }, { "nullable": true, @@ -100,7 +145,12 @@ "KBC.sanitizedName": "countycode", "KBC.uniqueKey": false }, - "name": "countycode" + "name": "countycode", + "data_type": { + "base": { + "type": "STRING" + } + } }, { "nullable": true, @@ -110,7 +160,12 @@ "KBC.sanitizedName": "userstate", "KBC.uniqueKey": false }, - "name": "userstate" + "name": "userstate", + "data_type": { + "base": { + "type": "STRING" + } + } }, { "nullable": true, @@ -120,7 +175,12 @@ "KBC.sanitizedName": "categorygroup", "KBC.uniqueKey": false }, - "name": "categorygroup" + "name": "categorygroup", + "data_type": { + "base": { + "type": "STRING" + } + } } ] -} \ No newline at end of file +} diff --git a/tests/functional/run-action-via-ssh-tunnel/expected/data/out/tables/in.c-main.sales.csv.manifest b/tests/functional/run-action-via-ssh-tunnel/expected/data/out/tables/in.c-main.sales.csv.manifest index 427a98b..07aa083 100644 --- a/tests/functional/run-action-via-ssh-tunnel/expected/data/out/tables/in.c-main.sales.csv.manifest +++ b/tests/functional/run-action-via-ssh-tunnel/expected/data/out/tables/in.c-main.sales.csv.manifest @@ -21,6 +21,10 @@ "key": "KBC.datatype.nullable", "value": true }, + { + "key": "KBC.datatype.basetype", + "value": "STRING" + }, { "key": "KBC.sourceName", "value": "usergender" @@ -39,6 +43,10 @@ "key": "KBC.datatype.nullable", "value": true }, + { + "key": "KBC.datatype.basetype", + "value": "STRING" + }, { "key": "KBC.sourceName", "value": "usercity" @@ -57,6 +65,10 @@ "key": "KBC.datatype.nullable", "value": true }, + { + "key": "KBC.datatype.basetype", + "value": "STRING" + }, { "key": "KBC.sourceName", "value": "usersentiment" @@ -75,6 +87,10 @@ "key": "KBC.datatype.nullable", "value": true }, + { + "key": "KBC.datatype.basetype", + "value": "STRING" + }, { "key": "KBC.sourceName", "value": "zipcode" @@ -93,6 +109,10 @@ "key": "KBC.datatype.nullable", "value": true }, + { + "key": "KBC.datatype.basetype", + "value": "STRING" + }, { "key": "KBC.sourceName", "value": "sku" @@ -111,6 +131,10 @@ "key": "KBC.datatype.nullable", "value": true }, + { + "key": "KBC.datatype.basetype", + "value": "STRING" + }, { "key": "KBC.sourceName", "value": "createdat" @@ -129,6 +153,10 @@ "key": "KBC.datatype.nullable", "value": true }, + { + "key": "KBC.datatype.basetype", + "value": "STRING" + }, { "key": "KBC.sourceName", "value": "category" @@ -147,6 +175,10 @@ "key": "KBC.datatype.nullable", "value": true }, + { + "key": "KBC.datatype.basetype", + "value": "STRING" + }, { "key": "KBC.sourceName", "value": "price" @@ -165,6 +197,10 @@ "key": "KBC.datatype.nullable", "value": true }, + { + "key": "KBC.datatype.basetype", + "value": "STRING" + }, { "key": "KBC.sourceName", "value": "county" @@ -183,6 +219,10 @@ "key": "KBC.datatype.nullable", "value": true }, + { + "key": "KBC.datatype.basetype", + "value": "STRING" + }, { "key": "KBC.sourceName", "value": "countycode" @@ -201,6 +241,10 @@ "key": "KBC.datatype.nullable", "value": true }, + { + "key": "KBC.datatype.basetype", + "value": "STRING" + }, { "key": "KBC.sourceName", "value": "userstate" @@ -219,6 +263,10 @@ "key": "KBC.datatype.nullable", "value": true }, + { + "key": "KBC.datatype.basetype", + "value": "STRING" + }, { "key": "KBC.sourceName", "value": "categorygroup" @@ -233,4 +281,4 @@ } ] } -} \ No newline at end of file +} diff --git a/tests/functional/run-action/expected/data/out/tables/in.c-main.sales.csv.manifest b/tests/functional/run-action/expected/data/out/tables/in.c-main.sales.csv.manifest index b2c3c9e..dc629db 100644 --- a/tests/functional/run-action/expected/data/out/tables/in.c-main.sales.csv.manifest +++ b/tests/functional/run-action/expected/data/out/tables/in.c-main.sales.csv.manifest @@ -21,6 +21,10 @@ "key": "KBC.datatype.nullable", "value": true }, + { + "key": "KBC.datatype.basetype", + "value": "STRING" + }, { "key": "KBC.sourceName", "value": "usergender" @@ -39,6 +43,10 @@ "key": "KBC.datatype.nullable", "value": true }, + { + "key": "KBC.datatype.basetype", + "value": "STRING" + }, { "key": "KBC.sourceName", "value": "usercity" @@ -57,6 +65,10 @@ "key": "KBC.datatype.nullable", "value": true }, + { + "key": "KBC.datatype.basetype", + "value": "STRING" + }, { "key": "KBC.sourceName", "value": "usersentiment" @@ -75,6 +87,10 @@ "key": "KBC.datatype.nullable", "value": true }, + { + "key": "KBC.datatype.basetype", + "value": "STRING" + }, { "key": "KBC.sourceName", "value": "zipcode" @@ -93,6 +109,10 @@ "key": "KBC.datatype.nullable", "value": true }, + { + "key": "KBC.datatype.basetype", + "value": "STRING" + }, { "key": "KBC.sourceName", "value": "sku" @@ -111,6 +131,10 @@ "key": "KBC.datatype.nullable", "value": true }, + { + "key": "KBC.datatype.basetype", + "value": "STRING" + }, { "key": "KBC.sourceName", "value": "createdat" @@ -129,6 +153,10 @@ "key": "KBC.datatype.nullable", "value": true }, + { + "key": "KBC.datatype.basetype", + "value": "STRING" + }, { "key": "KBC.sourceName", "value": "category" @@ -147,6 +175,10 @@ "key": "KBC.datatype.nullable", "value": true }, + { + "key": "KBC.datatype.basetype", + "value": "STRING" + }, { "key": "KBC.sourceName", "value": "price" @@ -165,6 +197,10 @@ "key": "KBC.datatype.nullable", "value": true }, + { + "key": "KBC.datatype.basetype", + "value": "STRING" + }, { "key": "KBC.sourceName", "value": "county" @@ -183,6 +219,10 @@ "key": "KBC.datatype.nullable", "value": true }, + { + "key": "KBC.datatype.basetype", + "value": "STRING" + }, { "key": "KBC.sourceName", "value": "countycode" @@ -201,6 +241,10 @@ "key": "KBC.datatype.nullable", "value": true }, + { + "key": "KBC.datatype.basetype", + "value": "STRING" + }, { "key": "KBC.sourceName", "value": "userstate" @@ -219,6 +263,10 @@ "key": "KBC.datatype.nullable", "value": true }, + { + "key": "KBC.datatype.basetype", + "value": "STRING" + }, { "key": "KBC.sourceName", "value": "categorygroup" @@ -236,4 +284,4 @@ "primary_key": [ "sku" ] -} \ No newline at end of file +} diff --git a/tests/functional/ssl-not-verify-cert-missing-certificate/expected/data/out/tables/in.c-main.sales.csv.manifest b/tests/functional/ssl-not-verify-cert-missing-certificate/expected/data/out/tables/in.c-main.sales.csv.manifest index 427a98b..07aa083 100644 --- a/tests/functional/ssl-not-verify-cert-missing-certificate/expected/data/out/tables/in.c-main.sales.csv.manifest +++ b/tests/functional/ssl-not-verify-cert-missing-certificate/expected/data/out/tables/in.c-main.sales.csv.manifest @@ -21,6 +21,10 @@ "key": "KBC.datatype.nullable", "value": true }, + { + "key": "KBC.datatype.basetype", + "value": "STRING" + }, { "key": "KBC.sourceName", "value": "usergender" @@ -39,6 +43,10 @@ "key": "KBC.datatype.nullable", "value": true }, + { + "key": "KBC.datatype.basetype", + "value": "STRING" + }, { "key": "KBC.sourceName", "value": "usercity" @@ -57,6 +65,10 @@ "key": "KBC.datatype.nullable", "value": true }, + { + "key": "KBC.datatype.basetype", + "value": "STRING" + }, { "key": "KBC.sourceName", "value": "usersentiment" @@ -75,6 +87,10 @@ "key": "KBC.datatype.nullable", "value": true }, + { + "key": "KBC.datatype.basetype", + "value": "STRING" + }, { "key": "KBC.sourceName", "value": "zipcode" @@ -93,6 +109,10 @@ "key": "KBC.datatype.nullable", "value": true }, + { + "key": "KBC.datatype.basetype", + "value": "STRING" + }, { "key": "KBC.sourceName", "value": "sku" @@ -111,6 +131,10 @@ "key": "KBC.datatype.nullable", "value": true }, + { + "key": "KBC.datatype.basetype", + "value": "STRING" + }, { "key": "KBC.sourceName", "value": "createdat" @@ -129,6 +153,10 @@ "key": "KBC.datatype.nullable", "value": true }, + { + "key": "KBC.datatype.basetype", + "value": "STRING" + }, { "key": "KBC.sourceName", "value": "category" @@ -147,6 +175,10 @@ "key": "KBC.datatype.nullable", "value": true }, + { + "key": "KBC.datatype.basetype", + "value": "STRING" + }, { "key": "KBC.sourceName", "value": "price" @@ -165,6 +197,10 @@ "key": "KBC.datatype.nullable", "value": true }, + { + "key": "KBC.datatype.basetype", + "value": "STRING" + }, { "key": "KBC.sourceName", "value": "county" @@ -183,6 +219,10 @@ "key": "KBC.datatype.nullable", "value": true }, + { + "key": "KBC.datatype.basetype", + "value": "STRING" + }, { "key": "KBC.sourceName", "value": "countycode" @@ -201,6 +241,10 @@ "key": "KBC.datatype.nullable", "value": true }, + { + "key": "KBC.datatype.basetype", + "value": "STRING" + }, { "key": "KBC.sourceName", "value": "userstate" @@ -219,6 +263,10 @@ "key": "KBC.datatype.nullable", "value": true }, + { + "key": "KBC.datatype.basetype", + "value": "STRING" + }, { "key": "KBC.sourceName", "value": "categorygroup" @@ -233,4 +281,4 @@ } ] } -} \ No newline at end of file +} diff --git a/tests/functional/ssl-not-verify-cert-valid-certificate/expected/data/out/tables/in.c-main.sales.csv.manifest b/tests/functional/ssl-not-verify-cert-valid-certificate/expected/data/out/tables/in.c-main.sales.csv.manifest index 427a98b..07aa083 100644 --- a/tests/functional/ssl-not-verify-cert-valid-certificate/expected/data/out/tables/in.c-main.sales.csv.manifest +++ b/tests/functional/ssl-not-verify-cert-valid-certificate/expected/data/out/tables/in.c-main.sales.csv.manifest @@ -21,6 +21,10 @@ "key": "KBC.datatype.nullable", "value": true }, + { + "key": "KBC.datatype.basetype", + "value": "STRING" + }, { "key": "KBC.sourceName", "value": "usergender" @@ -39,6 +43,10 @@ "key": "KBC.datatype.nullable", "value": true }, + { + "key": "KBC.datatype.basetype", + "value": "STRING" + }, { "key": "KBC.sourceName", "value": "usercity" @@ -57,6 +65,10 @@ "key": "KBC.datatype.nullable", "value": true }, + { + "key": "KBC.datatype.basetype", + "value": "STRING" + }, { "key": "KBC.sourceName", "value": "usersentiment" @@ -75,6 +87,10 @@ "key": "KBC.datatype.nullable", "value": true }, + { + "key": "KBC.datatype.basetype", + "value": "STRING" + }, { "key": "KBC.sourceName", "value": "zipcode" @@ -93,6 +109,10 @@ "key": "KBC.datatype.nullable", "value": true }, + { + "key": "KBC.datatype.basetype", + "value": "STRING" + }, { "key": "KBC.sourceName", "value": "sku" @@ -111,6 +131,10 @@ "key": "KBC.datatype.nullable", "value": true }, + { + "key": "KBC.datatype.basetype", + "value": "STRING" + }, { "key": "KBC.sourceName", "value": "createdat" @@ -129,6 +153,10 @@ "key": "KBC.datatype.nullable", "value": true }, + { + "key": "KBC.datatype.basetype", + "value": "STRING" + }, { "key": "KBC.sourceName", "value": "category" @@ -147,6 +175,10 @@ "key": "KBC.datatype.nullable", "value": true }, + { + "key": "KBC.datatype.basetype", + "value": "STRING" + }, { "key": "KBC.sourceName", "value": "price" @@ -165,6 +197,10 @@ "key": "KBC.datatype.nullable", "value": true }, + { + "key": "KBC.datatype.basetype", + "value": "STRING" + }, { "key": "KBC.sourceName", "value": "county" @@ -183,6 +219,10 @@ "key": "KBC.datatype.nullable", "value": true }, + { + "key": "KBC.datatype.basetype", + "value": "STRING" + }, { "key": "KBC.sourceName", "value": "countycode" @@ -201,6 +241,10 @@ "key": "KBC.datatype.nullable", "value": true }, + { + "key": "KBC.datatype.basetype", + "value": "STRING" + }, { "key": "KBC.sourceName", "value": "userstate" @@ -219,6 +263,10 @@ "key": "KBC.datatype.nullable", "value": true }, + { + "key": "KBC.datatype.basetype", + "value": "STRING" + }, { "key": "KBC.sourceName", "value": "categorygroup" @@ -233,4 +281,4 @@ } ] } -} \ No newline at end of file +} diff --git a/tests/functional/ssl-verify-cert-ignore-invalid-cn-certificate/expected/data/out/tables/in.c-main.sales.csv.manifest b/tests/functional/ssl-verify-cert-ignore-invalid-cn-certificate/expected/data/out/tables/in.c-main.sales.csv.manifest index 427a98b..07aa083 100644 --- a/tests/functional/ssl-verify-cert-ignore-invalid-cn-certificate/expected/data/out/tables/in.c-main.sales.csv.manifest +++ b/tests/functional/ssl-verify-cert-ignore-invalid-cn-certificate/expected/data/out/tables/in.c-main.sales.csv.manifest @@ -21,6 +21,10 @@ "key": "KBC.datatype.nullable", "value": true }, + { + "key": "KBC.datatype.basetype", + "value": "STRING" + }, { "key": "KBC.sourceName", "value": "usergender" @@ -39,6 +43,10 @@ "key": "KBC.datatype.nullable", "value": true }, + { + "key": "KBC.datatype.basetype", + "value": "STRING" + }, { "key": "KBC.sourceName", "value": "usercity" @@ -57,6 +65,10 @@ "key": "KBC.datatype.nullable", "value": true }, + { + "key": "KBC.datatype.basetype", + "value": "STRING" + }, { "key": "KBC.sourceName", "value": "usersentiment" @@ -75,6 +87,10 @@ "key": "KBC.datatype.nullable", "value": true }, + { + "key": "KBC.datatype.basetype", + "value": "STRING" + }, { "key": "KBC.sourceName", "value": "zipcode" @@ -93,6 +109,10 @@ "key": "KBC.datatype.nullable", "value": true }, + { + "key": "KBC.datatype.basetype", + "value": "STRING" + }, { "key": "KBC.sourceName", "value": "sku" @@ -111,6 +131,10 @@ "key": "KBC.datatype.nullable", "value": true }, + { + "key": "KBC.datatype.basetype", + "value": "STRING" + }, { "key": "KBC.sourceName", "value": "createdat" @@ -129,6 +153,10 @@ "key": "KBC.datatype.nullable", "value": true }, + { + "key": "KBC.datatype.basetype", + "value": "STRING" + }, { "key": "KBC.sourceName", "value": "category" @@ -147,6 +175,10 @@ "key": "KBC.datatype.nullable", "value": true }, + { + "key": "KBC.datatype.basetype", + "value": "STRING" + }, { "key": "KBC.sourceName", "value": "price" @@ -165,6 +197,10 @@ "key": "KBC.datatype.nullable", "value": true }, + { + "key": "KBC.datatype.basetype", + "value": "STRING" + }, { "key": "KBC.sourceName", "value": "county" @@ -183,6 +219,10 @@ "key": "KBC.datatype.nullable", "value": true }, + { + "key": "KBC.datatype.basetype", + "value": "STRING" + }, { "key": "KBC.sourceName", "value": "countycode" @@ -201,6 +241,10 @@ "key": "KBC.datatype.nullable", "value": true }, + { + "key": "KBC.datatype.basetype", + "value": "STRING" + }, { "key": "KBC.sourceName", "value": "userstate" @@ -219,6 +263,10 @@ "key": "KBC.datatype.nullable", "value": true }, + { + "key": "KBC.datatype.basetype", + "value": "STRING" + }, { "key": "KBC.sourceName", "value": "categorygroup" @@ -233,4 +281,4 @@ } ] } -} \ No newline at end of file +} diff --git a/tests/functional/ssl-verify-cert-invalid-cn-certificate/expected/data/out/tables/in.c-main.sales.csv.manifest b/tests/functional/ssl-verify-cert-invalid-cn-certificate/expected/data/out/tables/in.c-main.sales.csv.manifest index 427a98b..07aa083 100644 --- a/tests/functional/ssl-verify-cert-invalid-cn-certificate/expected/data/out/tables/in.c-main.sales.csv.manifest +++ b/tests/functional/ssl-verify-cert-invalid-cn-certificate/expected/data/out/tables/in.c-main.sales.csv.manifest @@ -21,6 +21,10 @@ "key": "KBC.datatype.nullable", "value": true }, + { + "key": "KBC.datatype.basetype", + "value": "STRING" + }, { "key": "KBC.sourceName", "value": "usergender" @@ -39,6 +43,10 @@ "key": "KBC.datatype.nullable", "value": true }, + { + "key": "KBC.datatype.basetype", + "value": "STRING" + }, { "key": "KBC.sourceName", "value": "usercity" @@ -57,6 +65,10 @@ "key": "KBC.datatype.nullable", "value": true }, + { + "key": "KBC.datatype.basetype", + "value": "STRING" + }, { "key": "KBC.sourceName", "value": "usersentiment" @@ -75,6 +87,10 @@ "key": "KBC.datatype.nullable", "value": true }, + { + "key": "KBC.datatype.basetype", + "value": "STRING" + }, { "key": "KBC.sourceName", "value": "zipcode" @@ -93,6 +109,10 @@ "key": "KBC.datatype.nullable", "value": true }, + { + "key": "KBC.datatype.basetype", + "value": "STRING" + }, { "key": "KBC.sourceName", "value": "sku" @@ -111,6 +131,10 @@ "key": "KBC.datatype.nullable", "value": true }, + { + "key": "KBC.datatype.basetype", + "value": "STRING" + }, { "key": "KBC.sourceName", "value": "createdat" @@ -129,6 +153,10 @@ "key": "KBC.datatype.nullable", "value": true }, + { + "key": "KBC.datatype.basetype", + "value": "STRING" + }, { "key": "KBC.sourceName", "value": "category" @@ -147,6 +175,10 @@ "key": "KBC.datatype.nullable", "value": true }, + { + "key": "KBC.datatype.basetype", + "value": "STRING" + }, { "key": "KBC.sourceName", "value": "price" @@ -165,6 +197,10 @@ "key": "KBC.datatype.nullable", "value": true }, + { + "key": "KBC.datatype.basetype", + "value": "STRING" + }, { "key": "KBC.sourceName", "value": "county" @@ -183,6 +219,10 @@ "key": "KBC.datatype.nullable", "value": true }, + { + "key": "KBC.datatype.basetype", + "value": "STRING" + }, { "key": "KBC.sourceName", "value": "countycode" @@ -201,6 +241,10 @@ "key": "KBC.datatype.nullable", "value": true }, + { + "key": "KBC.datatype.basetype", + "value": "STRING" + }, { "key": "KBC.sourceName", "value": "userstate" @@ -219,6 +263,10 @@ "key": "KBC.datatype.nullable", "value": true }, + { + "key": "KBC.datatype.basetype", + "value": "STRING" + }, { "key": "KBC.sourceName", "value": "categorygroup" @@ -233,4 +281,4 @@ } ] } -} \ No newline at end of file +} diff --git a/tests/functional/ssl-verify-cert-valid-certificate/expected/data/out/tables/in.c-main.sales.csv.manifest b/tests/functional/ssl-verify-cert-valid-certificate/expected/data/out/tables/in.c-main.sales.csv.manifest index 427a98b..07aa083 100644 --- a/tests/functional/ssl-verify-cert-valid-certificate/expected/data/out/tables/in.c-main.sales.csv.manifest +++ b/tests/functional/ssl-verify-cert-valid-certificate/expected/data/out/tables/in.c-main.sales.csv.manifest @@ -21,6 +21,10 @@ "key": "KBC.datatype.nullable", "value": true }, + { + "key": "KBC.datatype.basetype", + "value": "STRING" + }, { "key": "KBC.sourceName", "value": "usergender" @@ -39,6 +43,10 @@ "key": "KBC.datatype.nullable", "value": true }, + { + "key": "KBC.datatype.basetype", + "value": "STRING" + }, { "key": "KBC.sourceName", "value": "usercity" @@ -57,6 +65,10 @@ "key": "KBC.datatype.nullable", "value": true }, + { + "key": "KBC.datatype.basetype", + "value": "STRING" + }, { "key": "KBC.sourceName", "value": "usersentiment" @@ -75,6 +87,10 @@ "key": "KBC.datatype.nullable", "value": true }, + { + "key": "KBC.datatype.basetype", + "value": "STRING" + }, { "key": "KBC.sourceName", "value": "zipcode" @@ -93,6 +109,10 @@ "key": "KBC.datatype.nullable", "value": true }, + { + "key": "KBC.datatype.basetype", + "value": "STRING" + }, { "key": "KBC.sourceName", "value": "sku" @@ -111,6 +131,10 @@ "key": "KBC.datatype.nullable", "value": true }, + { + "key": "KBC.datatype.basetype", + "value": "STRING" + }, { "key": "KBC.sourceName", "value": "createdat" @@ -129,6 +153,10 @@ "key": "KBC.datatype.nullable", "value": true }, + { + "key": "KBC.datatype.basetype", + "value": "STRING" + }, { "key": "KBC.sourceName", "value": "category" @@ -147,6 +175,10 @@ "key": "KBC.datatype.nullable", "value": true }, + { + "key": "KBC.datatype.basetype", + "value": "STRING" + }, { "key": "KBC.sourceName", "value": "price" @@ -165,6 +197,10 @@ "key": "KBC.datatype.nullable", "value": true }, + { + "key": "KBC.datatype.basetype", + "value": "STRING" + }, { "key": "KBC.sourceName", "value": "county" @@ -183,6 +219,10 @@ "key": "KBC.datatype.nullable", "value": true }, + { + "key": "KBC.datatype.basetype", + "value": "STRING" + }, { "key": "KBC.sourceName", "value": "countycode" @@ -201,6 +241,10 @@ "key": "KBC.datatype.nullable", "value": true }, + { + "key": "KBC.datatype.basetype", + "value": "STRING" + }, { "key": "KBC.sourceName", "value": "userstate" @@ -219,6 +263,10 @@ "key": "KBC.datatype.nullable", "value": true }, + { + "key": "KBC.datatype.basetype", + "value": "STRING" + }, { "key": "KBC.sourceName", "value": "categorygroup" @@ -233,4 +281,4 @@ } ] } -} \ No newline at end of file +} diff --git a/tests/functional/ssl-without-ca/expected/data/out/tables/in.c-main.sales.csv.manifest b/tests/functional/ssl-without-ca/expected/data/out/tables/in.c-main.sales.csv.manifest index 427a98b..07aa083 100644 --- a/tests/functional/ssl-without-ca/expected/data/out/tables/in.c-main.sales.csv.manifest +++ b/tests/functional/ssl-without-ca/expected/data/out/tables/in.c-main.sales.csv.manifest @@ -21,6 +21,10 @@ "key": "KBC.datatype.nullable", "value": true }, + { + "key": "KBC.datatype.basetype", + "value": "STRING" + }, { "key": "KBC.sourceName", "value": "usergender" @@ -39,6 +43,10 @@ "key": "KBC.datatype.nullable", "value": true }, + { + "key": "KBC.datatype.basetype", + "value": "STRING" + }, { "key": "KBC.sourceName", "value": "usercity" @@ -57,6 +65,10 @@ "key": "KBC.datatype.nullable", "value": true }, + { + "key": "KBC.datatype.basetype", + "value": "STRING" + }, { "key": "KBC.sourceName", "value": "usersentiment" @@ -75,6 +87,10 @@ "key": "KBC.datatype.nullable", "value": true }, + { + "key": "KBC.datatype.basetype", + "value": "STRING" + }, { "key": "KBC.sourceName", "value": "zipcode" @@ -93,6 +109,10 @@ "key": "KBC.datatype.nullable", "value": true }, + { + "key": "KBC.datatype.basetype", + "value": "STRING" + }, { "key": "KBC.sourceName", "value": "sku" @@ -111,6 +131,10 @@ "key": "KBC.datatype.nullable", "value": true }, + { + "key": "KBC.datatype.basetype", + "value": "STRING" + }, { "key": "KBC.sourceName", "value": "createdat" @@ -129,6 +153,10 @@ "key": "KBC.datatype.nullable", "value": true }, + { + "key": "KBC.datatype.basetype", + "value": "STRING" + }, { "key": "KBC.sourceName", "value": "category" @@ -147,6 +175,10 @@ "key": "KBC.datatype.nullable", "value": true }, + { + "key": "KBC.datatype.basetype", + "value": "STRING" + }, { "key": "KBC.sourceName", "value": "price" @@ -165,6 +197,10 @@ "key": "KBC.datatype.nullable", "value": true }, + { + "key": "KBC.datatype.basetype", + "value": "STRING" + }, { "key": "KBC.sourceName", "value": "county" @@ -183,6 +219,10 @@ "key": "KBC.datatype.nullable", "value": true }, + { + "key": "KBC.datatype.basetype", + "value": "STRING" + }, { "key": "KBC.sourceName", "value": "countycode" @@ -201,6 +241,10 @@ "key": "KBC.datatype.nullable", "value": true }, + { + "key": "KBC.datatype.basetype", + "value": "STRING" + }, { "key": "KBC.sourceName", "value": "userstate" @@ -219,6 +263,10 @@ "key": "KBC.datatype.nullable", "value": true }, + { + "key": "KBC.datatype.basetype", + "value": "STRING" + }, { "key": "KBC.sourceName", "value": "categorygroup" @@ -233,4 +281,4 @@ } ] } -} \ No newline at end of file +} diff --git a/tests/phpunit/MSSQLTest.php b/tests/phpunit/MSSQLTest.php index 4408c06..c5d3967 100644 --- a/tests/phpunit/MSSQLTest.php +++ b/tests/phpunit/MSSQLTest.php @@ -958,6 +958,10 @@ private function checkTablesResult(array $config): void 'key' => 'KBC.datatype.nullable', 'value' => true, ], + [ + 'key' => 'KBC.datatype.basetype', + 'value' => 'STRING', + ], [ 'key' => 'KBC.sourceName', 'value' => 'usergender', @@ -976,6 +980,10 @@ private function checkTablesResult(array $config): void 'key' => 'KBC.datatype.nullable', 'value' => true, ], + [ + 'key' => 'KBC.datatype.basetype', + 'value' => 'STRING', + ], [ 'key' => 'KBC.sourceName', 'value' => 'usercity', @@ -994,6 +1002,10 @@ private function checkTablesResult(array $config): void 'key' => 'KBC.datatype.nullable', 'value' => true, ], + [ + 'key' => 'KBC.datatype.basetype', + 'value' => 'STRING', + ], [ 'key' => 'KBC.sourceName', 'value' => 'usersentiment', @@ -1012,6 +1024,10 @@ private function checkTablesResult(array $config): void 'key' => 'KBC.datatype.nullable', 'value' => true, ], + [ + 'key' => 'KBC.datatype.basetype', + 'value' => 'STRING', + ], [ 'key' => 'KBC.sourceName', 'value' => 'zipcode', @@ -1030,6 +1046,10 @@ private function checkTablesResult(array $config): void 'key' => 'KBC.datatype.nullable', 'value' => true, ], + [ + 'key' => 'KBC.datatype.basetype', + 'value' => 'STRING', + ], [ 'key' => 'KBC.sourceName', 'value' => 'sku', @@ -1048,6 +1068,10 @@ private function checkTablesResult(array $config): void 'key' => 'KBC.datatype.nullable', 'value' => true, ], + [ + 'key' => 'KBC.datatype.basetype', + 'value' => 'STRING', + ], [ 'key' => 'KBC.sourceName', 'value' => 'createdat', @@ -1066,6 +1090,10 @@ private function checkTablesResult(array $config): void 'key' => 'KBC.datatype.nullable', 'value' => true, ], + [ + 'key' => 'KBC.datatype.basetype', + 'value' => 'STRING', + ], [ 'key' => 'KBC.sourceName', 'value' => 'category', @@ -1084,6 +1112,10 @@ private function checkTablesResult(array $config): void 'key' => 'KBC.datatype.nullable', 'value' => true, ], + [ + 'key' => 'KBC.datatype.basetype', + 'value' => 'STRING', + ], [ 'key' => 'KBC.sourceName', 'value' => 'price', @@ -1102,6 +1134,10 @@ private function checkTablesResult(array $config): void 'key' => 'KBC.datatype.nullable', 'value' => true, ], + [ + 'key' => 'KBC.datatype.basetype', + 'value' => 'STRING', + ], [ 'key' => 'KBC.sourceName', 'value' => 'county', @@ -1120,6 +1156,10 @@ private function checkTablesResult(array $config): void 'key' => 'KBC.datatype.nullable', 'value' => true, ], + [ + 'key' => 'KBC.datatype.basetype', + 'value' => 'STRING', + ], [ 'key' => 'KBC.sourceName', 'value' => 'countycode', @@ -1138,6 +1178,10 @@ private function checkTablesResult(array $config): void 'key' => 'KBC.datatype.nullable', 'value' => true, ], + [ + 'key' => 'KBC.datatype.basetype', + 'value' => 'STRING', + ], [ 'key' => 'KBC.sourceName', 'value' => 'userstate', @@ -1156,6 +1200,10 @@ private function checkTablesResult(array $config): void 'key' => 'KBC.datatype.nullable', 'value' => true, ], + [ + 'key' => 'KBC.datatype.basetype', + 'value' => 'STRING', + ], [ 'key' => 'KBC.sourceName', 'value' => 'categorygroup', From 2385b2d1b130d8bf97a34c16b3dcf973fe7b1390 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=BDborn=C3=BD=20Adam?= Date: Thu, 8 Aug 2024 16:20:24 +0200 Subject: [PATCH 2/3] change docker-compose to docker compose --- .github/workflows/push.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 720fed8..a75a388 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -22,8 +22,8 @@ jobs: - name: Build image and run tests run: | docker build -t $APP_IMAGE . - docker-compose run --rm wait - docker-compose run --rm app + docker compose run --rm wait + docker compose run --rm app - name: Push image to ECR run: | docker pull quay.io/keboola/developer-portal-cli-v2:latest From 43964ae5b103945c74b9d18a4b1488a9ffa2e392 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=BDborn=C3=BD=20Adam?= Date: Thu, 8 Aug 2024 16:26:42 +0200 Subject: [PATCH 3/3] fix DB version in CI --- tests/functional/timeout/expected-stdout | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/functional/timeout/expected-stdout b/tests/functional/timeout/expected-stdout index cf45c5f..81a93e4 100644 --- a/tests/functional/timeout/expected-stdout +++ b/tests/functional/timeout/expected-stdout @@ -1,7 +1,7 @@ Connecting to DSN 'sqlsrv:Server=mssql,1433;Database=test' Exporting "sales" to "in.c-main.sales". Exporting by "BCP" adapter. -Found database server version: 15.0.4375.4 +Found database server version: %s Executing BCP command: bcp 'WAITFOR DELAY '\''00:00:15'\''; SELECT * FROM "sales";' queryout 'in.c-main.sales.csv' -S 'mssql,1433' -U 'sa' -P ***** -d 'test' -q -k -b 50000 -m 1 -t "," -r "\n" -c The BCP command timed out after 1 seconds.. Retrying... [1x] Executing BCP command: bcp 'WAITFOR DELAY '\''00:00:15'\''; SELECT * FROM "sales";' queryout 'in.c-main.sales.csv' -S 'mssql,1433' -U 'sa' -P ***** -d 'test' -q -k -b 50000 -m 1 -t "," -r "\n" -c