diff --git a/.github/workflows/broken_links_checker.yml b/.github/workflows/broken_links_checker.yml index c4ff3be..f2079ec 100644 --- a/.github/workflows/broken_links_checker.yml +++ b/.github/workflows/broken_links_checker.yml @@ -22,6 +22,8 @@ jobs: echo '{"aliveStatusCodes": [429, 200], "ignorePatterns": [' \ '{"pattern": "^https?://(www|dev).mysql.com/"},' \ '{"pattern": "^https?://(www.)?opensource.org"}' \ + '{"pattern": "^https?://(www.)?eclipse.org"}' \ + '{"pattern": "^https?://projects.eclipse.org"}' \ ']}' > ./target/broken_links_checker.json - uses: gaurav-nelson/github-action-markdown-link-check@v1 with: diff --git a/.project-keeper.yml b/.project-keeper.yml index f638d54..7e7e3c6 100644 --- a/.project-keeper.yml +++ b/.project-keeper.yml @@ -9,4 +9,3 @@ sources: linkReplacements: excludes: - "E-PK-CORE-18: Outdated content: '.github/workflows/ci-build.yml'" - - regex: "(?s)E-PK-CORE-53: The dependencies.md file has outdated content.*" diff --git a/dependencies.md b/dependencies.md index b8aea44..0a17a9f 100644 --- a/dependencies.md +++ b/dependencies.md @@ -3,117 +3,116 @@ ## Compile Dependencies -| Dependency | License | -| ------------------------------- | ------------------------------------------------------------------------------------------------------------ | -| [Virtual Schema Common JDBC][0] | [MIT License][1] | -| [EXASolution JDBC Driver][2] | [EXAClient License][3] | -| [error-reporting-java][4] | [MIT License][5] | -| [JSON-P Default Provider][6] | [Eclipse Public License 2.0][7]; [GNU General Public License, version 2 with the GNU Classpath Exception][8] | +| Dependency | License | +| ------------------------------- | ---------------------- | +| [Virtual Schema Common JDBC][0] | [MIT License][1] | +| [EXASolution JDBC Driver][2] | [EXAClient License][3] | +| [error-reporting-java][4] | [MIT License][5] | ## Test Dependencies -| Dependency | License | -| ----------------------------------------------- | --------------------------------- | -| [Virtual Schema Common JDBC][0] | [MIT License][1] | -| [Hamcrest][9] | [BSD License 3][10] | -| [JUnit Jupiter (Aggregator)][11] | [Eclipse Public License v2.0][12] | -| [mockito-junit-jupiter][13] | [The MIT License][14] | -| [Test containers for Exasol on Docker][15] | [MIT License][16] | -| [Testcontainers :: JUnit Jupiter Extension][17] | [MIT][18] | -| [Matcher for SQL Result Sets][19] | [MIT License][20] | -| [SLF4J JDK14 Binding][21] | [MIT License][22] | -| [Test Database Builder for Java][23] | [MIT License][24] | -| [Maven Project Version Getter][25] | [MIT License][26] | -| [JaCoCo :: Agent][27] | [Eclipse Public License 2.0][28] | +| Dependency | License | +| ----------------------------------------------- | -------------------------------- | +| [Virtual Schema Common JDBC][0] | [MIT License][1] | +| [Hamcrest][6] | [BSD License 3][7] | +| [JUnit Jupiter (Aggregator)][8] | [Eclipse Public License v2.0][9] | +| [mockito-junit-jupiter][10] | [The MIT License][11] | +| [Test containers for Exasol on Docker][12] | [MIT License][13] | +| [Testcontainers :: JUnit Jupiter Extension][14] | [MIT][15] | +| [Matcher for SQL Result Sets][16] | [MIT License][17] | +| [SLF4J JDK14 Binding][18] | [MIT License][19] | +| [Test Database Builder for Java][20] | [MIT License][21] | +| [Maven Project Version Getter][22] | [MIT License][23] | +| [JaCoCo :: Agent][24] | [Eclipse Public License 2.0][25] | ## Plugin Dependencies | Dependency | License | | ------------------------------------------------------- | ---------------------------------------------- | -| [SonarQube Scanner for Maven][29] | [GNU LGPL 3][30] | -| [Apache Maven Compiler Plugin][31] | [Apache License, Version 2.0][32] | -| [Apache Maven Enforcer Plugin][33] | [Apache License, Version 2.0][32] | -| [Maven Flatten Plugin][34] | [Apache Software Licenese][32] | -| [org.sonatype.ossindex.maven:ossindex-maven-plugin][35] | [ASL2][36] | -| [Maven Surefire Plugin][37] | [Apache License, Version 2.0][32] | -| [Versions Maven Plugin][38] | [Apache License, Version 2.0][32] | -| [Project keeper maven plugin][39] | [The MIT License][40] | -| [Apache Maven Assembly Plugin][41] | [Apache License, Version 2.0][32] | -| [Apache Maven JAR Plugin][42] | [Apache License, Version 2.0][32] | -| [Artifact reference checker and unifier][43] | [MIT][44] | -| [Apache Maven Deploy Plugin][45] | [Apache License, Version 2.0][32] | -| [Apache Maven GPG Plugin][46] | [Apache License, Version 2.0][32] | -| [Apache Maven Source Plugin][47] | [Apache License, Version 2.0][32] | -| [Apache Maven Javadoc Plugin][48] | [Apache License, Version 2.0][32] | -| [Nexus Staging Maven Plugin][49] | [Eclipse Public License][50] | -| [Apache Maven Dependency Plugin][51] | [Apache License, Version 2.0][32] | -| [Maven Failsafe Plugin][52] | [Apache License, Version 2.0][32] | -| [JaCoCo :: Maven Plugin][53] | [Eclipse Public License 2.0][28] | -| [error-code-crawler-maven-plugin][54] | [MIT License][55] | -| [Reproducible Build Maven Plugin][56] | [Apache 2.0][36] | -| [Maven Clean Plugin][57] | [The Apache Software License, Version 2.0][36] | -| [Maven Resources Plugin][58] | [The Apache Software License, Version 2.0][36] | -| [Maven Install Plugin][59] | [The Apache Software License, Version 2.0][36] | -| [Maven Site Plugin 3][60] | [The Apache Software License, Version 2.0][36] | +| [SonarQube Scanner for Maven][26] | [GNU LGPL 3][27] | +| [Apache Maven Compiler Plugin][28] | [Apache-2.0][29] | +| [Apache Maven Enforcer Plugin][30] | [Apache-2.0][29] | +| [Maven Flatten Plugin][31] | [Apache Software Licenese][29] | +| [org.sonatype.ossindex.maven:ossindex-maven-plugin][32] | [ASL2][33] | +| [Maven Surefire Plugin][34] | [Apache-2.0][29] | +| [Versions Maven Plugin][35] | [Apache License, Version 2.0][29] | +| [duplicate-finder-maven-plugin Maven Mojo][36] | [Apache License 2.0][37] | +| [Project keeper maven plugin][38] | [The MIT License][39] | +| [Apache Maven Assembly Plugin][40] | [Apache License, Version 2.0][29] | +| [Apache Maven JAR Plugin][41] | [Apache License, Version 2.0][29] | +| [Artifact reference checker and unifier][42] | [MIT][43] | +| [Apache Maven Deploy Plugin][44] | [Apache-2.0][29] | +| [Apache Maven GPG Plugin][45] | [Apache-2.0][29] | +| [Apache Maven Source Plugin][46] | [Apache License, Version 2.0][29] | +| [Apache Maven Javadoc Plugin][47] | [Apache License, Version 2.0][29] | +| [Nexus Staging Maven Plugin][48] | [Eclipse Public License][49] | +| [Apache Maven Dependency Plugin][50] | [Apache-2.0][29] | +| [Maven Failsafe Plugin][51] | [Apache-2.0][29] | +| [JaCoCo :: Maven Plugin][52] | [Eclipse Public License 2.0][25] | +| [error-code-crawler-maven-plugin][53] | [MIT License][54] | +| [Reproducible Build Maven Plugin][55] | [Apache 2.0][33] | +| [Maven Clean Plugin][56] | [The Apache Software License, Version 2.0][33] | +| [Maven Resources Plugin][57] | [The Apache Software License, Version 2.0][33] | +| [Maven Install Plugin][58] | [The Apache Software License, Version 2.0][33] | +| [Maven Site Plugin 3][59] | [The Apache Software License, Version 2.0][33] | [0]: https://github.com/exasol/virtual-schema-common-jdbc/ [1]: https://github.com/exasol/virtual-schema-common-jdbc/blob/main/LICENSE [2]: http://www.exasol.com -[3]: https://docs.exasol.com/connect_exasol/drivers/jdbc.htm +[3]: https://repo1.maven.org/maven2/com/exasol/exasol-jdbc/7.1.20/exasol-jdbc-7.1.20-license.txt [4]: https://github.com/exasol/error-reporting-java/ [5]: https://github.com/exasol/error-reporting-java/blob/main/LICENSE -[6]: https://github.com/eclipse-ee4j/jsonp -[7]: https://projects.eclipse.org/license/epl-2.0 -[8]: https://projects.eclipse.org/license/secondary-gpl-2.0-cp -[9]: http://hamcrest.org/JavaHamcrest/ -[10]: http://opensource.org/licenses/BSD-3-Clause -[11]: https://junit.org/junit5/ -[12]: https://www.eclipse.org/legal/epl-v20.html -[13]: https://github.com/mockito/mockito -[14]: https://github.com/mockito/mockito/blob/main/LICENSE -[15]: https://github.com/exasol/exasol-testcontainers/ -[16]: https://github.com/exasol/exasol-testcontainers/blob/main/LICENSE -[17]: https://testcontainers.org -[18]: http://opensource.org/licenses/MIT -[19]: https://github.com/exasol/hamcrest-resultset-matcher/ -[20]: https://github.com/exasol/hamcrest-resultset-matcher/blob/main/LICENSE -[21]: http://www.slf4j.org -[22]: http://www.opensource.org/licenses/mit-license.php -[23]: https://github.com/exasol/test-db-builder-java/ -[24]: https://github.com/exasol/test-db-builder-java/blob/main/LICENSE -[25]: https://github.com/exasol/maven-project-version-getter/ -[26]: https://github.com/exasol/maven-project-version-getter/blob/main/LICENSE -[27]: https://www.eclemma.org/jacoco/index.html -[28]: https://www.eclipse.org/legal/epl-2.0/ -[29]: http://sonarsource.github.io/sonar-scanner-maven/ -[30]: http://www.gnu.org/licenses/lgpl.txt -[31]: https://maven.apache.org/plugins/maven-compiler-plugin/ -[32]: https://www.apache.org/licenses/LICENSE-2.0.txt -[33]: https://maven.apache.org/enforcer/maven-enforcer-plugin/ -[34]: https://www.mojohaus.org/flatten-maven-plugin/ -[35]: https://sonatype.github.io/ossindex-maven/maven-plugin/ -[36]: http://www.apache.org/licenses/LICENSE-2.0.txt -[37]: https://maven.apache.org/surefire/maven-surefire-plugin/ -[38]: https://www.mojohaus.org/versions/versions-maven-plugin/ -[39]: https://github.com/exasol/project-keeper/ -[40]: https://github.com/exasol/project-keeper/blob/main/LICENSE -[41]: https://maven.apache.org/plugins/maven-assembly-plugin/ -[42]: https://maven.apache.org/plugins/maven-jar-plugin/ -[43]: https://github.com/exasol/artifact-reference-checker-maven-plugin -[44]: https://opensource.org/licenses/MIT -[45]: https://maven.apache.org/plugins/maven-deploy-plugin/ -[46]: https://maven.apache.org/plugins/maven-gpg-plugin/ -[47]: https://maven.apache.org/plugins/maven-source-plugin/ -[48]: https://maven.apache.org/plugins/maven-javadoc-plugin/ -[49]: http://www.sonatype.com/public-parent/nexus-maven-plugins/nexus-staging/nexus-staging-maven-plugin/ -[50]: http://www.eclipse.org/legal/epl-v10.html -[51]: https://maven.apache.org/plugins/maven-dependency-plugin/ -[52]: https://maven.apache.org/surefire/maven-failsafe-plugin/ -[53]: https://www.jacoco.org/jacoco/trunk/doc/maven.html -[54]: https://github.com/exasol/error-code-crawler-maven-plugin/ -[55]: https://github.com/exasol/error-code-crawler-maven-plugin/blob/main/LICENSE -[56]: http://zlika.github.io/reproducible-build-maven-plugin -[57]: http://maven.apache.org/plugins/maven-clean-plugin/ -[58]: http://maven.apache.org/plugins/maven-resources-plugin/ -[59]: http://maven.apache.org/plugins/maven-install-plugin/ -[60]: http://maven.apache.org/plugins/maven-site-plugin/ +[6]: http://hamcrest.org/JavaHamcrest/ +[7]: http://opensource.org/licenses/BSD-3-Clause +[8]: https://junit.org/junit5/ +[9]: https://www.eclipse.org/legal/epl-v20.html +[10]: https://github.com/mockito/mockito +[11]: https://github.com/mockito/mockito/blob/main/LICENSE +[12]: https://github.com/exasol/exasol-testcontainers/ +[13]: https://github.com/exasol/exasol-testcontainers/blob/main/LICENSE +[14]: https://testcontainers.org +[15]: http://opensource.org/licenses/MIT +[16]: https://github.com/exasol/hamcrest-resultset-matcher/ +[17]: https://github.com/exasol/hamcrest-resultset-matcher/blob/main/LICENSE +[18]: http://www.slf4j.org +[19]: http://www.opensource.org/licenses/mit-license.php +[20]: https://github.com/exasol/test-db-builder-java/ +[21]: https://github.com/exasol/test-db-builder-java/blob/main/LICENSE +[22]: https://github.com/exasol/maven-project-version-getter/ +[23]: https://github.com/exasol/maven-project-version-getter/blob/main/LICENSE +[24]: https://www.eclemma.org/jacoco/index.html +[25]: https://www.eclipse.org/legal/epl-2.0/ +[26]: http://sonarsource.github.io/sonar-scanner-maven/ +[27]: http://www.gnu.org/licenses/lgpl.txt +[28]: https://maven.apache.org/plugins/maven-compiler-plugin/ +[29]: https://www.apache.org/licenses/LICENSE-2.0.txt +[30]: https://maven.apache.org/enforcer/maven-enforcer-plugin/ +[31]: https://www.mojohaus.org/flatten-maven-plugin/ +[32]: https://sonatype.github.io/ossindex-maven/maven-plugin/ +[33]: http://www.apache.org/licenses/LICENSE-2.0.txt +[34]: https://maven.apache.org/surefire/maven-surefire-plugin/ +[35]: https://www.mojohaus.org/versions/versions-maven-plugin/ +[36]: https://basepom.github.io/duplicate-finder-maven-plugin +[37]: http://www.apache.org/licenses/LICENSE-2.0.html +[38]: https://github.com/exasol/project-keeper/ +[39]: https://github.com/exasol/project-keeper/blob/main/LICENSE +[40]: https://maven.apache.org/plugins/maven-assembly-plugin/ +[41]: https://maven.apache.org/plugins/maven-jar-plugin/ +[42]: https://github.com/exasol/artifact-reference-checker-maven-plugin +[43]: https://opensource.org/licenses/MIT +[44]: https://maven.apache.org/plugins/maven-deploy-plugin/ +[45]: https://maven.apache.org/plugins/maven-gpg-plugin/ +[46]: https://maven.apache.org/plugins/maven-source-plugin/ +[47]: https://maven.apache.org/plugins/maven-javadoc-plugin/ +[48]: http://www.sonatype.com/public-parent/nexus-maven-plugins/nexus-staging/nexus-staging-maven-plugin/ +[49]: http://www.eclipse.org/legal/epl-v10.html +[50]: https://maven.apache.org/plugins/maven-dependency-plugin/ +[51]: https://maven.apache.org/surefire/maven-failsafe-plugin/ +[52]: https://www.jacoco.org/jacoco/trunk/doc/maven.html +[53]: https://github.com/exasol/error-code-crawler-maven-plugin/ +[54]: https://github.com/exasol/error-code-crawler-maven-plugin/blob/main/LICENSE +[55]: http://zlika.github.io/reproducible-build-maven-plugin +[56]: http://maven.apache.org/plugins/maven-clean-plugin/ +[57]: http://maven.apache.org/plugins/maven-resources-plugin/ +[58]: http://maven.apache.org/plugins/maven-install-plugin/ +[59]: http://maven.apache.org/plugins/maven-site-plugin/ diff --git a/doc/changes/changelog.md b/doc/changes/changelog.md index f0ca3d2..d58f1d2 100644 --- a/doc/changes/changelog.md +++ b/doc/changes/changelog.md @@ -1,5 +1,6 @@ # Changes +* [7.1.3](changes_7.1.3.md) * [7.1.2](changes_7.1.2.md) * [7.1.1](changes_7.1.1.md) * [7.1.0](changes_7.1.0.md) diff --git a/doc/changes/changes_7.1.3.md b/doc/changes/changes_7.1.3.md new file mode 100644 index 0000000..db2dc41 --- /dev/null +++ b/doc/changes/changes_7.1.3.md @@ -0,0 +1,37 @@ +# Exasol Virtual Schema 7.1.3, released 2023-07-07 + +Code name: Refactoring + +## Summary + +This release replaces Adapter Property `IS_LOCAL` from `virtual-schema-common-java` by a constant in the current project as this property is specific to Exasol Virtual Schema. + +See also ticket [VSCOMJAVA #273](https://github.com/exasol/virtual-schema-common-java/pull/273) removing the adapter property from `virtual-schema-common-java`. + +## Refactoring + +* #85: Replaced adapter property `IS_LOCAL` from virtual-schema-common-java by a constant in VSEXA. + +## Dependency Updates + +### Compile Dependency Updates + +* Updated `com.exasol:virtual-schema-common-jdbc:10.5.0` to `11.0.0` + +### Test Dependency Updates + +* Updated `com.exasol:virtual-schema-common-jdbc:10.5.0` to `11.0.0` +* Updated `org.jacoco:org.jacoco.agent:0.8.9` to `0.8.10` + +### Plugin Dependency Updates + +* Updated `com.exasol:error-code-crawler-maven-plugin:1.2.3` to `1.3.0` +* Updated `com.exasol:project-keeper-maven-plugin:2.9.7` to `2.9.9` +* Updated `org.apache.maven.plugins:maven-dependency-plugin:3.5.0` to `3.6.0` +* Updated `org.apache.maven.plugins:maven-failsafe-plugin:3.0.0` to `3.1.2` +* Updated `org.apache.maven.plugins:maven-gpg-plugin:3.0.1` to `3.1.0` +* Updated `org.apache.maven.plugins:maven-surefire-plugin:3.0.0` to `3.1.2` +* Updated `org.basepom.maven:duplicate-finder-maven-plugin:1.5.1` to `2.0.1` +* Updated `org.codehaus.mojo:flatten-maven-plugin:1.4.1` to `1.5.0` +* Updated `org.codehaus.mojo:versions-maven-plugin:2.15.0` to `2.16.0` +* Updated `org.jacoco:jacoco-maven-plugin:0.8.9` to `0.8.10` diff --git a/doc/dialects/exasol.md b/doc/dialects/exasol.md index a4663dc..7e30f71 100644 --- a/doc/dialects/exasol.md +++ b/doc/dialects/exasol.md @@ -17,7 +17,7 @@ The SQL statement below creates the adapter script, defines the Java class that ```sql CREATE JAVA ADAPTER SCRIPT SCHEMA_FOR_VS_SCRIPT.ADAPTER_SCRIPT_EXASOL AS %scriptclass com.exasol.adapter.RequestDispatcher; - %jar /buckets///virtual-schema-dist-10.5.0-exasol-7.1.2.jar; + %jar /buckets///virtual-schema-dist-11.0.0-exasol-7.1.3.jar; / ``` diff --git a/pk_generated_parent.pom b/pk_generated_parent.pom index 010dccc..80b9229 100644 --- a/pk_generated_parent.pom +++ b/pk_generated_parent.pom @@ -3,7 +3,7 @@ 4.0.0 com.exasol exasol-virtual-schema-generated-parent - 7.1.2 + 7.1.3 pom UTF-8 @@ -46,7 +46,7 @@ org.jacoco org.jacoco.agent - 0.8.9 + 0.8.10 test runtime @@ -90,7 +90,7 @@ org.codehaus.mojo flatten-maven-plugin - 1.4.1 + 1.5.0 true oss @@ -129,7 +129,7 @@ org.apache.maven.plugins maven-surefire-plugin - 3.0.0 + 3.1.2 @@ -140,7 +140,7 @@ org.codehaus.mojo versions-maven-plugin - 2.15.0 + 2.16.0 display-updates @@ -158,7 +158,7 @@ org.basepom.maven duplicate-finder-maven-plugin - 1.5.1 + 2.0.1 default @@ -184,7 +184,7 @@ org.apache.maven.plugins maven-assembly-plugin - 3.5.0 + 3.6.0 src/assembly/all-dependencies.xml @@ -242,7 +242,7 @@ org.apache.maven.plugins maven-gpg-plugin - 3.0.1 + 3.1.0 sign-artifacts @@ -316,7 +316,7 @@ org.apache.maven.plugins maven-dependency-plugin - 3.5.0 + 3.6.0 copy-jacoco @@ -336,7 +336,7 @@ org.apache.maven.plugins maven-failsafe-plugin - 3.0.0 + 3.1.2 @@ -359,7 +359,7 @@ org.jacoco jacoco-maven-plugin - 0.8.9 + 0.8.10 prepare-agent @@ -406,7 +406,7 @@ com.exasol error-code-crawler-maven-plugin - 1.2.3 + 1.3.0 verify diff --git a/pom.xml b/pom.xml index cded037..7d2b47d 100644 --- a/pom.xml +++ b/pom.xml @@ -2,12 +2,12 @@ 4.0.0 exasol-virtual-schema - 7.1.2 + 7.1.3 Exasol Virtual Schema This projects contains the Exasol dialect for Exasol's Virtual Schema https://github.com/exasol/exasol-virtual-schema/ - 10.5.0 + 11.0.0 @@ -105,7 +105,7 @@ com.exasol project-keeper-maven-plugin - 2.9.7 + 2.9.9 @@ -190,7 +190,7 @@ exasol-virtual-schema-generated-parent com.exasol - 7.1.2 + 7.1.3 pk_generated_parent.pom diff --git a/src/main/java/com/exasol/adapter/dialects/exasol/ExasolProperties.java b/src/main/java/com/exasol/adapter/dialects/exasol/ExasolProperties.java index 775fc5c..b4aaa42 100644 --- a/src/main/java/com/exasol/adapter/dialects/exasol/ExasolProperties.java +++ b/src/main/java/com/exasol/adapter/dialects/exasol/ExasolProperties.java @@ -6,6 +6,7 @@ final class ExasolProperties { static final String EXASOL_IMPORT_PROPERTY = "IMPORT_FROM_EXA"; static final String EXASOL_CONNECTION_PROPERTY = "EXA_CONNECTION"; + static final String EXASOL_IS_LOCAL_PROPERTY = "IS_LOCAL"; private ExasolProperties() { // prevent instantiation diff --git a/src/main/java/com/exasol/adapter/dialects/exasol/ExasolSqlDialect.java b/src/main/java/com/exasol/adapter/dialects/exasol/ExasolSqlDialect.java index 68ec2a1..69b0821 100644 --- a/src/main/java/com/exasol/adapter/dialects/exasol/ExasolSqlDialect.java +++ b/src/main/java/com/exasol/adapter/dialects/exasol/ExasolSqlDialect.java @@ -2,8 +2,7 @@ import static com.exasol.adapter.AdapterProperties.*; import static com.exasol.adapter.capabilities.MainCapability.*; -import static com.exasol.adapter.dialects.exasol.ExasolProperties.EXASOL_CONNECTION_PROPERTY; -import static com.exasol.adapter.dialects.exasol.ExasolProperties.EXASOL_IMPORT_PROPERTY; +import static com.exasol.adapter.dialects.exasol.ExasolProperties.*; import static com.exasol.adapter.sql.ScalarFunction.*; import java.sql.SQLException; @@ -36,10 +35,10 @@ public class ExasolSqlDialect extends AbstractSqlDialect { public ExasolSqlDialect(final ConnectionFactory connectionFactory, final AdapterProperties properties) { super(connectionFactory, properties, Set.of(CATALOG_NAME_PROPERTY, SCHEMA_NAME_PROPERTY, EXASOL_IMPORT_PROPERTY, EXASOL_CONNECTION_PROPERTY, - IS_LOCAL_PROPERTY, IGNORE_ERRORS_PROPERTY), // + EXASOL_IS_LOCAL_PROPERTY, IGNORE_ERRORS_PROPERTY), // List.of(SchemaNameProperty.validator(NAME), // BooleanProperty.validator(EXASOL_IMPORT_PROPERTY), // - BooleanProperty.validator(IS_LOCAL_PROPERTY), // + BooleanProperty.validator(EXASOL_IS_LOCAL_PROPERTY), // ImportProperty.validator(EXASOL_IMPORT_PROPERTY, EXASOL_CONNECTION_PROPERTY))); this.omitParenthesesMap.addAll(Set.of(SYSDATE, SYSTIMESTAMP, CURRENT_SCHEMA, CURRENT_SESSION, CURRENT_STATEMENT, CURRENT_USER, CURRENT_CLUSTER)); @@ -91,7 +90,7 @@ protected RemoteMetadataReader createRemoteMetadataReader() { */ @Override protected QueryRewriter createQueryRewriter() { - if (this.properties.isLocalSource()) { + if (this.properties.isEnabled(EXASOL_IS_LOCAL_PROPERTY)) { return new ExasolLocalQueryRewriter(this); } else if (isImportFromExa(this.properties)) { return new ExasolFromExaQueryRewriter(this, createRemoteMetadataReader()); diff --git a/src/test/java/com/exasol/adapter/dialects/exasol/ExasolFromExaQueryRewriterTest.java b/src/test/java/com/exasol/adapter/dialects/exasol/ExasolFromExaQueryRewriterTest.java index 4586e80..84486d9 100644 --- a/src/test/java/com/exasol/adapter/dialects/exasol/ExasolFromExaQueryRewriterTest.java +++ b/src/test/java/com/exasol/adapter/dialects/exasol/ExasolFromExaQueryRewriterTest.java @@ -1,9 +1,7 @@ package com.exasol.adapter.dialects.exasol; import static com.exasol.adapter.AdapterProperties.CONNECTION_NAME_PROPERTY; -import static com.exasol.adapter.AdapterProperties.IS_LOCAL_PROPERTY; -import static com.exasol.adapter.dialects.exasol.ExasolProperties.EXASOL_CONNECTION_PROPERTY; -import static com.exasol.adapter.dialects.exasol.ExasolProperties.EXASOL_IMPORT_PROPERTY; +import static com.exasol.adapter.dialects.exasol.ExasolProperties.*; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; import static org.mockito.Mockito.mock; @@ -69,7 +67,7 @@ void rewriteWithJdbcConnectionAndExpectedResultSetDataTypes(@Mock final Connecti @Test void rewriteLocal() throws AdapterException, SQLException { - final AdapterProperties properties = new AdapterProperties(Map.of(IS_LOCAL_PROPERTY, "true")); + final AdapterProperties properties = new AdapterProperties(Map.of(EXASOL_IS_LOCAL_PROPERTY, "true")); final SqlDialect dialect = new ExasolSqlDialect(null, properties); final QueryRewriter queryRewriter = new ExasolLocalQueryRewriter(dialect); assertThat(queryRewriter.rewrite(this.statement, EMPTY_SELECT_LIST_DATA_TYPES, EXA_METADATA, properties), diff --git a/src/test/java/com/exasol/adapter/dialects/exasol/ExasolSqlDialectLocalConnectionIT.java b/src/test/java/com/exasol/adapter/dialects/exasol/ExasolSqlDialectLocalConnectionIT.java index e7af7fc..32865fe 100644 --- a/src/test/java/com/exasol/adapter/dialects/exasol/ExasolSqlDialectLocalConnectionIT.java +++ b/src/test/java/com/exasol/adapter/dialects/exasol/ExasolSqlDialectLocalConnectionIT.java @@ -1,5 +1,6 @@ package com.exasol.adapter.dialects.exasol; +import static com.exasol.adapter.dialects.exasol.ExasolProperties.EXASOL_IS_LOCAL_PROPERTY; import static com.exasol.matcher.ResultSetStructureMatcher.table; import java.util.*; @@ -24,7 +25,7 @@ class ExasolSqlDialectLocalConnectionIT extends AbstractExasolSqlDialectIT { @Override protected Map getConnectionSpecificVirtualSchemaProperties() { - return Map.of("IS_LOCAL", "true"); + return Map.of(EXASOL_IS_LOCAL_PROPERTY, "true"); } @Override diff --git a/src/test/java/com/exasol/adapter/dialects/exasol/ExasolSqlDialectTest.java b/src/test/java/com/exasol/adapter/dialects/exasol/ExasolSqlDialectTest.java index babd729..b323851 100644 --- a/src/test/java/com/exasol/adapter/dialects/exasol/ExasolSqlDialectTest.java +++ b/src/test/java/com/exasol/adapter/dialects/exasol/ExasolSqlDialectTest.java @@ -2,8 +2,7 @@ import static com.exasol.adapter.AdapterProperties.*; import static com.exasol.adapter.capabilities.MainCapability.*; -import static com.exasol.adapter.dialects.exasol.ExasolProperties.EXASOL_CONNECTION_PROPERTY; -import static com.exasol.adapter.dialects.exasol.ExasolProperties.EXASOL_IMPORT_PROPERTY; +import static com.exasol.adapter.dialects.exasol.ExasolProperties.*; import static com.exasol.adapter.dialects.exasol.ExasolSqlDialect.EXASOL_TIMESTAMP_WITH_LOCAL_TIME_ZONE_SWITCH; import static com.exasol.reflect.ReflectionUtils.getMethodReturnViaReflection; import static org.hamcrest.CoreMatchers.containsString; @@ -154,7 +153,7 @@ void testCreateJdbcQueryRewriter(@Mock final Connection connectionMock) throws S @Test void testCreateLocalQueryRewriter() { - this.rawProperties.put(IS_LOCAL_PROPERTY, "true"); + this.rawProperties.put(EXASOL_IS_LOCAL_PROPERTY, "true"); final AdapterProperties properties = new AdapterProperties(this.rawProperties); final SqlDialect dialect = new ExasolSqlDialect(this.connectionFactoryMock, properties); assertThat(getMethodReturnViaReflection(dialect, "createQueryRewriter"), @@ -232,7 +231,7 @@ void testValidateSchemaProperty() throws PropertyValidationException { @Test void checkInvalidIsLocalProperty() { final AdapterProperties adapterProperties = mandatory() // - .with(IS_LOCAL_PROPERTY, "asdasd") // + .with(EXASOL_IS_LOCAL_PROPERTY, "asdasd") // .build(); final SqlDialect sqlDialect = new ExasolSqlDialect(null, adapterProperties); final PropertyValidationException exception = assertThrows(PropertyValidationException.class, @@ -243,14 +242,14 @@ void checkInvalidIsLocalProperty() { @Test void checkValidIsLocalProperty1() throws PropertyValidationException { - final AdapterProperties adapterProperties = mandatory().with(IS_LOCAL_PROPERTY, "TrUe").build(); + final AdapterProperties adapterProperties = mandatory().with(EXASOL_IS_LOCAL_PROPERTY, "TrUe").build(); final SqlDialect sqlDialect = new ExasolSqlDialect(null, adapterProperties); sqlDialect.validateProperties(); } @Test void checkValidIsLocalProperty() throws PropertyValidationException { - final AdapterProperties adapterProperties = mandatory().with(IS_LOCAL_PROPERTY, "FalSe").build(); + final AdapterProperties adapterProperties = mandatory().with(EXASOL_IS_LOCAL_PROPERTY, "FalSe").build(); final SqlDialect sqlDialect = new ExasolSqlDialect(null, adapterProperties); sqlDialect.validateProperties(); } diff --git a/src/test/java/com/exasol/adapter/dialects/exasol/IntegrationTestConfiguration.java b/src/test/java/com/exasol/adapter/dialects/exasol/IntegrationTestConfiguration.java index e0330af..8cb1fe3 100644 --- a/src/test/java/com/exasol/adapter/dialects/exasol/IntegrationTestConfiguration.java +++ b/src/test/java/com/exasol/adapter/dialects/exasol/IntegrationTestConfiguration.java @@ -8,7 +8,7 @@ public final class IntegrationTestConfiguration { * Do not use MavenProjectVersionGetter here to enable reference checker to check if reference points to the latest * version. */ - public static final String VIRTUAL_SCHEMAS_JAR_NAME_AND_VERSION = "virtual-schema-dist-10.5.0-exasol-7.1.2.jar"; + public static final String VIRTUAL_SCHEMAS_JAR_NAME_AND_VERSION = "virtual-schema-dist-11.0.0-exasol-7.1.3.jar"; public static final Path PATH_TO_VIRTUAL_SCHEMAS_JAR = Path.of("target", VIRTUAL_SCHEMAS_JAR_NAME_AND_VERSION); private IntegrationTestConfiguration() {