From 95686c60c014af3923653430631a66cb960e9f67 Mon Sep 17 00:00:00 2001 From: Pieterjan Spoelders Date: Tue, 26 Mar 2024 10:44:23 +0100 Subject: [PATCH 1/4] #25 : update Ci to include v8, major version increase because of earlier update to vsjdbc12.0.0 --- .github/workflows/ci-build.yml | 2 +- .project-keeper.yml | 1 + doc/changes/changelog.md | 1 + doc/changes/changes_3.0.0.md | 15 +++++++++++++++ doc/user_guide/db2_user_guide.md | 4 ++-- pk_generated_parent.pom | 2 +- pom.xml | 4 ++-- .../db2/IntegrationTestConfiguration.java | 2 +- 8 files changed, 24 insertions(+), 7 deletions(-) create mode 100644 doc/changes/changes_3.0.0.md diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml index 881b474..e847dc0 100644 --- a/.github/workflows/ci-build.yml +++ b/.github/workflows/ci-build.yml @@ -21,7 +21,7 @@ jobs: strategy: fail-fast: false matrix: - exasol_db_version: ["7.1.25"] + exasol_db_version: ["7.1.25", "8.24.0"] env: DEFAULT_EXASOL_DB_VERSION: "7.1.25" steps: diff --git a/.project-keeper.yml b/.project-keeper.yml index 9d9c179..6f0895a 100644 --- a/.project-keeper.yml +++ b/.project-keeper.yml @@ -9,4 +9,5 @@ build: runnerOs: ubuntu-20.04 exasolDbVersions: - "7.1.25" + - "8.24.0" excludes: diff --git a/doc/changes/changelog.md b/doc/changes/changelog.md index 6fa2987..6a8dacc 100644 --- a/doc/changes/changelog.md +++ b/doc/changes/changelog.md @@ -1,5 +1,6 @@ # Changes +* [3.0.0](changes_3.0.0.md) * [2.1.4](changes_2.1.4.md) * [2.1.3](changes_2.1.3.md) * [2.1.2](changes_2.1.2.md) diff --git a/doc/changes/changes_3.0.0.md b/doc/changes/changes_3.0.0.md new file mode 100644 index 0000000..ae7e503 --- /dev/null +++ b/doc/changes/changes_3.0.0.md @@ -0,0 +1,15 @@ +# Virtual Schema for DB2 3.0.0, released 2024-??-?? + +Code name: Char set is always `utf-8`, deprecated IMPORT_DATA_TYPES `FROM_RESULT_SET` value . + +## Summary + +The behaviour when it comes to character sets is now simplified, +The target char set is now always UTF-8. +The `IMPORT_DATA_TYPES` property (and value `FROM_RESULT_SET`) are now deprecated (change in vs-common-jdbc): +An exception will be thrown when users use`FROM_RESULT_SET`. The exception message warns the user that the value is no longer supported and the property itself is also deprecated. + +## Refactoring + +* #25: Update tests to V8 VSMYSQL / Update to vsjdbc 12.0.0 + diff --git a/doc/user_guide/db2_user_guide.md b/doc/user_guide/db2_user_guide.md index dc6d48a..936d9f4 100644 --- a/doc/user_guide/db2_user_guide.md +++ b/doc/user_guide/db2_user_guide.md @@ -56,7 +56,7 @@ The SQL statement below creates the adapter script, defines the Java class that ```sql CREATE OR REPLACE JAVA ADAPTER SCRIPT ADAPTER.JDBC_ADAPTER AS %scriptclass com.exasol.adapter.RequestDispatcher; - %jar /buckets///virtual-schema-dist-12.0.0-db2-2.1.4.jar; + %jar /buckets///virtual-schema-dist-12.0.0-db2-3.0.0.jar; %jar /buckets///db2jcc4.jar; %jar /buckets///db2jcc_license_cu.jar; / @@ -68,7 +68,7 @@ CREATE OR REPLACE JAVA ADAPTER SCRIPT ADAPTER.JDBC_ADAPTER AS ```sql CREATE OR REPLACE JAVA ADAPTER SCRIPT ADAPTER.JDBC_ADAPTER AS %scriptclass com.exasol.adapter.RequestDispatcher; - %jar /buckets///virtual-schema-dist-12.0.0-db2-2.1.4.jar; + %jar /buckets///virtual-schema-dist-12.0.0-db2-3.0.0.jar; %jar /buckets///db2jcc4.jar; %jar /buckets///db2jcc_license_cu.jar; %jar /buckets///db2jcc_license_cisuz.jar; diff --git a/pk_generated_parent.pom b/pk_generated_parent.pom index 0fe0e10..5a8a119 100644 --- a/pk_generated_parent.pom +++ b/pk_generated_parent.pom @@ -3,7 +3,7 @@ 4.0.0 com.exasol db2-virtual-schema-generated-parent - 2.1.4 + 3.0.0 pom UTF-8 diff --git a/pom.xml b/pom.xml index 9a139f8..2e1d243 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.exasol db2-virtual-schema - 2.1.4 + 3.0.0 Virtual Schema for DB2 Virtual Schema for connecting DB2 as a data source to Exasol https://github.com/exasol/db2-virtual-schema/ @@ -183,7 +183,7 @@ db2-virtual-schema-generated-parent com.exasol - 2.1.4 + 3.0.0 pk_generated_parent.pom diff --git a/src/test/java/com/exasol/adapter/dialects/db2/IntegrationTestConfiguration.java b/src/test/java/com/exasol/adapter/dialects/db2/IntegrationTestConfiguration.java index 4e58a86..aeb1e56 100644 --- a/src/test/java/com/exasol/adapter/dialects/db2/IntegrationTestConfiguration.java +++ b/src/test/java/com/exasol/adapter/dialects/db2/IntegrationTestConfiguration.java @@ -8,7 +8,7 @@ public class IntegrationTestConfiguration { public static final String EXASOL_DOCKER_REFERENCE = "7.1.19"; public static final DockerImageName DB2_DOCKER_REFERENCE = DockerImageName .parse("icr.io/db2_community/db2:11.5.8.0").asCompatibleSubstituteFor("ibmcom/db2"); - public static final String VIRTUAL_SCHEMAS_JAR_NAME_AND_VERSION = "virtual-schema-dist-12.0.0-db2-2.1.4.jar"; + public static final String VIRTUAL_SCHEMAS_JAR_NAME_AND_VERSION = "virtual-schema-dist-12.0.0-db2-3.0.0.jar"; public static final Path PATH_TO_VIRTUAL_SCHEMAS_JAR = Path.of("target", VIRTUAL_SCHEMAS_JAR_NAME_AND_VERSION); public static final int DB2_PORT = 50000; public static final String JDBC_DRIVER_CONFIGURATION_FILE_NAME = "settings.cfg"; From 6eca9330f939ae92629cefe2d7bee24ea4607694 Mon Sep 17 00:00:00 2001 From: Pieterjan Spoelders Date: Tue, 26 Mar 2024 11:13:23 +0100 Subject: [PATCH 2/4] fix container startup issue --- .github/workflows/ci-build.yml | 2 +- .project-keeper.yml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml index e847dc0..bffccdb 100644 --- a/.github/workflows/ci-build.yml +++ b/.github/workflows/ci-build.yml @@ -26,7 +26,7 @@ jobs: DEFAULT_EXASOL_DB_VERSION: "7.1.25" steps: - name: Free Disk Space - if: ${{ false }} + if: ${{ true }} run: | sudo rm -rf /usr/local/lib/android sudo rm -rf /usr/share/dotnet diff --git a/.project-keeper.yml b/.project-keeper.yml index 6f0895a..93eb5d3 100644 --- a/.project-keeper.yml +++ b/.project-keeper.yml @@ -10,4 +10,5 @@ build: exasolDbVersions: - "7.1.25" - "8.24.0" + freeDiskSpace: true excludes: From 17ca12aa855ddf9182ef42faf529401c6968ad53 Mon Sep 17 00:00:00 2001 From: Pieterjan Spoelders Date: Tue, 26 Mar 2024 12:56:21 +0100 Subject: [PATCH 3/4] Update changes_3.0.0.md Update release date --- doc/changes/changes_3.0.0.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/changes/changes_3.0.0.md b/doc/changes/changes_3.0.0.md index ae7e503..f19c7e0 100644 --- a/doc/changes/changes_3.0.0.md +++ b/doc/changes/changes_3.0.0.md @@ -1,4 +1,4 @@ -# Virtual Schema for DB2 3.0.0, released 2024-??-?? +# Virtual Schema for DB2 3.0.0, released 2024-03-26 Code name: Char set is always `utf-8`, deprecated IMPORT_DATA_TYPES `FROM_RESULT_SET` value . From 677f1167504bf423b93e87b4596d18f6c52a89f2 Mon Sep 17 00:00:00 2001 From: Pieterjan Spoelders Date: Tue, 26 Mar 2024 13:39:24 +0100 Subject: [PATCH 4/4] Apply suggestions from code review Co-authored-by: Christoph Pirkl --- doc/changes/changes_3.0.0.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/changes/changes_3.0.0.md b/doc/changes/changes_3.0.0.md index f19c7e0..b77d1c9 100644 --- a/doc/changes/changes_3.0.0.md +++ b/doc/changes/changes_3.0.0.md @@ -1,6 +1,6 @@ # Virtual Schema for DB2 3.0.0, released 2024-03-26 -Code name: Char set is always `utf-8`, deprecated IMPORT_DATA_TYPES `FROM_RESULT_SET` value . +Code name: Charset is always `utf-8`, deprecated IMPORT_DATA_TYPES `FROM_RESULT_SET` value ## Summary @@ -11,5 +11,5 @@ An exception will be thrown when users use`FROM_RESULT_SET`. The exception messa ## Refactoring -* #25: Update tests to V8 VSMYSQL / Update to vsjdbc 12.0.0 +* #25: Updated tests to Exasol v8, updated to vsjdbc 12.0.0