From 54e88dd42a232c7a7404cc56d03c6b77bb0ad8b1 Mon Sep 17 00:00:00 2001 From: Anastasiia Sergienko <46891819+AnastasiiaSergienko@users.noreply.github.com> Date: Wed, 30 Sep 2020 15:48:18 +0200 Subject: [PATCH] * #396: Updated to the `virtual-schema-common-java:6.0.0` (#397) * #396: Updated to the `virtual-schema-common-java:6.0.0` --- ...d_release_asset.yml => github_release.yml} | 17 ++++++++------- README.md | 2 +- doc/changes/changes_4.0.4.md | 21 ++++++++++++++----- doc/dialects/athena.md | 4 ++-- doc/dialects/aurora.md | 4 ++-- doc/dialects/bigquery.md | 2 +- doc/dialects/db2.md | 6 +++--- doc/dialects/hive.md | 6 +++--- doc/dialects/impala.md | 4 ++-- doc/dialects/mysql.md | 4 ++-- doc/dialects/oracle.md | 4 ++-- doc/dialects/postgresql.md | 4 ++-- doc/dialects/redshift.md | 4 ++-- doc/dialects/saphana.md | 4 ++-- doc/dialects/sql_server.md | 4 ++-- doc/dialects/sybase.md | 2 +- doc/dialects/teradata.md | 4 ++-- pom.xml | 20 +++++++++--------- .../hive/HiveSqlGenerationVisitor.java | 7 ++++--- .../sqlserver/SqlServerSqlDialect.java | 2 +- .../SqlServerSqlGenerationVisitor.java | 2 -- .../dialects/sybase/SybaseSqlDialect.java | 2 +- .../sybase/SybaseSqlGenerationVisitor.java | 4 +--- .../dialects/IntegrationTestConstants.java | 3 ++- .../db2/DB2SqlGenerationVisitorTest.java | 4 ++-- .../dialects/hive/HiveSqlDialectIT.java | 2 +- .../hive/HiveSqlGenerationVisitorTest.java | 13 +++++------- .../dialects/mysql/MySqlSqlDialectIT.java | 2 +- .../mysql/MySqlSqlGenerationVisitorTest.java | 2 +- .../dialects/oracle/OracleSqlDialectIT.java | 2 +- .../OracleSqlGenerationVisitorTest.java | 6 +++--- .../postgresql/PostgreSQLSqlDialectIT.java | 2 +- .../sqlserver/SqlServerSqlDialectIT.java | 2 +- .../sqlserver/SqlServerSqlDialectTest.java | 2 +- .../SqlServerSqlGenerationVisitorTest.java | 5 ++--- .../dialects/sybase/SybaseSqlDialectTest.java | 2 +- .../SybaseSqlGenerationVisitorTest.java | 5 ++--- src/test/java/utils/SqlNodesCreator.java | 6 +++--- 38 files changed, 99 insertions(+), 92 deletions(-) rename .github/workflows/{upload_release_asset.yml => github_release.yml} (65%) diff --git a/.github/workflows/upload_release_asset.yml b/.github/workflows/github_release.yml similarity index 65% rename from .github/workflows/upload_release_asset.yml rename to .github/workflows/github_release.yml index 804e20ce2..3afc9046f 100644 --- a/.github/workflows/upload_release_asset.yml +++ b/.github/workflows/github_release.yml @@ -1,14 +1,17 @@ -name: Upload Release Asset +name: GitHub Release on: workflow_dispatch: inputs: - version: - description: 'Release version' - required: true upload_url: description: 'Upload URL' required: true + asset_name: + description: 'Asset file name' + required: true + asset_path: + description: 'Asset file path' + required: true jobs: build: @@ -28,6 +31,6 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: upload_url: ${{ github.event.inputs.upload_url }} - asset_path: ./target/virtual-schema-dist-5.0.4-bundle-${{ github.event.inputs.version }}.jar - asset_name: virtual-schema-dist-5.0.4-bundle-${{ github.event.inputs.version }}.jar - asset_content_type: application/java-archive + asset_path: ${{ github.event.inputs.asset_path }} + asset_name: ${{ github.event.inputs.asset_name }} + asset_content_type: application/java-archive \ No newline at end of file diff --git a/README.md b/README.md index 64f7ae9fb..59b08fe06 100644 --- a/README.md +++ b/README.md @@ -189,4 +189,4 @@ Running the Virtual Schema requires a Java Runtime version 9 or later. [sql-server-dialect-doc]: doc/dialects/sql_server.md [sybase-dialect-doc]: doc/dialects/sybase.md [teradata-dialect-doc]: doc/dialects/teradata.md -[artifact-reference-checker-plugin]: https://github.com/exasol/artifact-reference-checker-maven-plugin +[artifact-reference-checker-plugin]: https://github.com/exasol/artifact-reference-checker-maven-plugin \ No newline at end of file diff --git a/doc/changes/changes_4.0.4.md b/doc/changes/changes_4.0.4.md index 5b6e84e0d..3b8d2ff49 100644 --- a/doc/changes/changes_4.0.4.md +++ b/doc/changes/changes_4.0.4.md @@ -5,18 +5,29 @@ Code name: ## Documentation * #371: Documented data types conversion for Hive dialect. -* #377: Improved Scalar Functions API documentation. -* #384: Turned embedded JSON into key-value encoding in Adapter Notes API examples. +* #377: Improved Scalar Functions API documentation. +* #384: Turned embedded JSON into key-value encoding in Adapter Notes API examples. * #386: Remove the documentation that was moved to the portal, added links instead. -* #394: Described 'No suitable driver found', added a note that Hive 1.1.0 has problems with its driver. +* #394: Described 'No suitable driver found', added a note that Hive 1.1.0 has problems with its driver. ## Refactoring * #263: Removed SybaseMetadataReader class as it was not used by the dialect. * #381: Migrated from version.sh to artifact-reference-checker-maven-plugin. * #389: Improved connection error handling. +* #396: Updated to the `virtual-schema-common-java:6.0.0` ## Dependency updates -* Updated `org.apache.hbase:hbase-server` from 2.3.0 to 2.3.1 -* Added com.exasol:artifact-reference-checker-maven-plugin:0.3.1 \ No newline at end of file +* Added com.exasol:artifact-reference-checker-maven-plugin:0.3.1 +* Updated com.exasol:virtual-schema-common-java:jar:5.0.4 to version 6.0.0 +* Updated org.apache.hbase:hbase-server:jar:2.3.0 to version 2.3.1 +* Updated org.junit.jupiter:junit-jupiter:jar:5.6.2 to version 5.7.0 +* Updated org.mockito:mockito-junit-jupiter:jar:3.4.6 to version 3.5.13 +* Updated com.exasol:exasol-jdbc:jar:6.2.5 to version 7.0.0 +* Updated com.exasol:exasol-testcontainers:jar:2.1.0 to version 3.1.0 +* Updated org.postgresql:postgresql:jar:42.2.14 to version 42.2.16 +* Updated org.apache.hbase:hbase-server:jar:2.3.1 to version 2.3.2 +* Updated com.microsoft.sqlserver:mssql-jdbc:jar:8.4.0.jre11 to version 8.4.1.jre11 +* Updated com.exasol:test-db-builder-java:jar:1.0.1 to version 1.1.0 +* Updated com.exasol:hamcrest-resultset-matcher:jar:1.1.1 to version 1.2.1 \ No newline at end of file diff --git a/doc/dialects/athena.md b/doc/dialects/athena.md index cb3de1906..54eccd728 100644 --- a/doc/dialects/athena.md +++ b/doc/dialects/athena.md @@ -49,7 +49,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-5.0.4-bundle-4.0.4.jar; + %jar /buckets///virtual-schema-dist-6.0.0-bundle-4.0.4.jar; %jar /buckets///AthenaJDBC42-.jar; / ; @@ -77,4 +77,4 @@ CREATE VIRTUAL SCHEMA SQL_DIALECT = 'ATHENA' CONNECTION_NAME = 'ATHENA_CONNECTION' SCHEMA_NAME = ''; -``` \ No newline at end of file +``` diff --git a/doc/dialects/aurora.md b/doc/dialects/aurora.md index 24f27137a..23bbd13f4 100644 --- a/doc/dialects/aurora.md +++ b/doc/dialects/aurora.md @@ -62,7 +62,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-5.0.4-bundle-4.0.4.jar; + %jar /buckets///virtual-schema-dist-6.0.0-bundle-4.0.4.jar; %jar /buckets///postgresql-.jar; / ``` @@ -125,4 +125,4 @@ The default schema is called `public`. ### PostgreSQL-specifics -Since this method of connecting uses the PostgreSQL database driver and SQL dialect, please check the [documentation of the PostgreSQL SQL dialect](postgresql.md) for details on type conversion and other PostgreSQL-specifics. \ No newline at end of file +Since this method of connecting uses the PostgreSQL database driver and SQL dialect, please check the [documentation of the PostgreSQL SQL dialect](postgresql.md) for details on type conversion and other PostgreSQL-specifics. diff --git a/doc/dialects/bigquery.md b/doc/dialects/bigquery.md index 4b7ccabcc..2f9e144fe 100644 --- a/doc/dialects/bigquery.md +++ b/doc/dialects/bigquery.md @@ -33,7 +33,7 @@ List all the JAR files from Magnitude Simba JDBC driver. ```sql CREATE JAVA ADAPTER SCRIPT SCHEMA_FOR_VS_SCRIPT.ADAPTER_SCRIPT_BIGQUERY AS %scriptclass com.exasol.adapter.RequestDispatcher; - %jar /buckets///virtual-schema-dist-5.0.4-bundle-4.0.4.jar; + %jar /buckets///virtual-schema-dist-6.0.0-bundle-4.0.4.jar; %jar /buckets///GoogleBigQueryJDBC42.jar; ... ... diff --git a/doc/dialects/db2.md b/doc/dialects/db2.md index 9d56d5395..079666460 100644 --- a/doc/dialects/db2.md +++ b/doc/dialects/db2.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-5.0.4-bundle-4.0.4.jar; + %jar /buckets///virtual-schema-dist-6.0.0-bundle-4.0.4.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-5.0.4-bundle-4.0.4.jar; + %jar /buckets///virtual-schema-dist-6.0.0-bundle-4.0.4.jar; %jar /buckets///db2jcc4.jar; %jar /buckets///db2jcc_license_cu.jar; %jar /buckets///db2jcc_license_cisuz.jar; @@ -119,4 +119,4 @@ The DB2 dialect handles implements specific casts for time data types and functi * `LIMIT` will replaced by `FETCH FIRST x ROWS ONLY` * `OFFSET` is currently not supported as only DB2 V11 support this natively -* `ADD_DAYS`, `ADD_WEEKS` ... will be replaced by `COLUMN + DAYS`, `COLUMN + ....` \ No newline at end of file +* `ADD_DAYS`, `ADD_WEEKS` ... will be replaced by `COLUMN + DAYS`, `COLUMN + ....` diff --git a/doc/dialects/hive.md b/doc/dialects/hive.md index b89202b0a..a75ccdfd1 100644 --- a/doc/dialects/hive.md +++ b/doc/dialects/hive.md @@ -47,7 +47,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///jars/virtual-schema-dist-5.0.4-bundle-4.0.4.jar; + %jar /buckets///jars/virtual-schema-dist-6.0.0-bundle-4.0.4.jar; %jar /buckets///jars/HiveJDBC41.jar; / ``` @@ -302,7 +302,7 @@ In Virtual Schema adapter: CREATE OR REPLACE JAVA ADAPTER SCRIPT ADAPTER.JDBC_ADAPTER AS %jvmoption -Dsun.security.krb5.disableReferrals=true; %scriptclass com.exasol.adapter.RequestDispatcher; - %jar /buckets///jars/virtual-schema-dist-5.0.4-bundle-4.0.4.jar; + %jar /buckets///jars/virtual-schema-dist-6.0.0-bundle-4.0.4.jar; %jar /buckets///jars/HiveJDBC41.jar; / ``` @@ -363,4 +363,4 @@ The driver is also available directly from [Simba technologies](http://www.simba Virtual Schema Version| Hive Version | Driver Name | Driver Version ----------------------|--------------|-------------|----------------- - 4.0.3 | 2.3.2 | HiveJDBC | 4.1 \ No newline at end of file + 4.0.3 | 2.3.2 | HiveJDBC | 4.1 diff --git a/doc/dialects/impala.md b/doc/dialects/impala.md index ff867a571..eed782c5c 100644 --- a/doc/dialects/impala.md +++ b/doc/dialects/impala.md @@ -47,7 +47,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-5.0.4-bundle-4.0.4.jar; + %jar /buckets///virtual-schema-dist-6.0.0-bundle-4.0.4.jar; %jar /buckets///ImpalaJDBC41.jar; / ; @@ -133,4 +133,4 @@ CREATE VIRTUAL SCHEMA SQL_DIALECT = 'IMPALA' CONNECTION_NAME = 'KRB_CONN' SCHEMA_NAME = ''; -``` \ No newline at end of file +``` diff --git a/doc/dialects/mysql.md b/doc/dialects/mysql.md index 7c68c7d72..22511c5db 100644 --- a/doc/dialects/mysql.md +++ b/doc/dialects/mysql.md @@ -51,7 +51,7 @@ The SQL statement below creates the adapter script, defines the Java class that ```sql CREATE OR REPLACE JAVA ADAPTER SCRIPT SCHEMA_FOR_VS_SCRIPT.ADAPTER_SCRIPT_MYSQL AS %scriptclass com.exasol.adapter.RequestDispatcher; - %jar /buckets///virtual-schema-dist-5.0.4-bundle-4.0.4.jar; + %jar /buckets///virtual-schema-dist-6.0.0-bundle-4.0.4.jar; %jar /buckets///mysql-connector-java-.jar; / ; @@ -126,4 +126,4 @@ In the following matrix you find combinations of JDBC driver and dialect version | Virtual Schema Version | MySQL Version | Driver Name | Driver Version | |------------------------|---------------|-----------------|----------------| -| Latest | MySQL 8.0.20 | MySQL Connector | 8.0.20 | \ No newline at end of file +| Latest | MySQL 8.0.20 | MySQL Connector | 8.0.20 | diff --git a/doc/dialects/oracle.md b/doc/dialects/oracle.md index fe216195c..f15a00839 100644 --- a/doc/dialects/oracle.md +++ b/doc/dialects/oracle.md @@ -48,7 +48,7 @@ The SQL statement below creates the adapter script, defines the Java class that ```sql CREATE JAVA ADAPTER SCRIPT ADAPTER.JDBC_ADAPTER AS %scriptclass com.exasol.adapter.RequestDispatcher; - %jar /buckets///virtual-schema-dist-5.0.4-bundle-4.0.4.jar; + %jar /buckets///virtual-schema-dist-6.0.0-bundle-4.0.4.jar; %jar /buckets///ojdbc.jar; / ; @@ -181,4 +181,4 @@ In the following matrix you find combinations of JDBC driver and dialect version | Virtual Schema Version | Oracle Version | Driver Name | Driver Version | |------------------------|--------------------|---------------------------|----------------| | 4.0.3 | Oracle XE 11g | ojdbc | 8 | -| 4.0.3 | Oracle XE 11g | instantclient-basic-linux | x64-12.1.0.2.0 | \ No newline at end of file +| 4.0.3 | Oracle XE 11g | instantclient-basic-linux | x64-12.1.0.2.0 | diff --git a/doc/dialects/postgresql.md b/doc/dialects/postgresql.md index b376c4f22..5be5b8417 100644 --- a/doc/dialects/postgresql.md +++ b/doc/dialects/postgresql.md @@ -25,7 +25,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-5.0.4-bundle-4.0.4.jar; + %jar /buckets///virtual-schema-dist-6.0.0-bundle-4.0.4.jar; %jar /buckets///postgresql-.jar; / ``` @@ -191,4 +191,4 @@ In the following matrix you find combinations of JDBC driver and dialect version | Virtual Schema Version | PostgreSQL Version | Driver Name | Driver Version | |------------------------|--------------------|------------------------|----------------| -| Latest | PostgreSQL 9.6.2 | PostgreSQL JDBC Driver | 42.2.5 | \ No newline at end of file +| Latest | PostgreSQL 9.6.2 | PostgreSQL JDBC Driver | 42.2.5 | diff --git a/doc/dialects/redshift.md b/doc/dialects/redshift.md index b1bcfb42c..876efdf38 100644 --- a/doc/dialects/redshift.md +++ b/doc/dialects/redshift.md @@ -51,7 +51,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-5.0.4-bundle-4.0.4.jar; + %jar /buckets///virtual-schema-dist-6.0.0-bundle-4.0.4.jar; %jar /buckets///RedshiftJDBC42-.jar; / ; @@ -80,4 +80,4 @@ CREATE VIRTUAL SCHEMA CONNECTION_NAME = 'REDSHIFT_CONNECTION' CATALOG_NAME = '' SCHEMA_NAME = 'public'; -``` \ No newline at end of file +``` diff --git a/doc/dialects/saphana.md b/doc/dialects/saphana.md index 0085975bb..0f5f385ba 100644 --- a/doc/dialects/saphana.md +++ b/doc/dialects/saphana.md @@ -47,7 +47,7 @@ The SQL statement below creates the adapter script, defines the Java class that ```sql CREATE JAVA ADAPTER SCRIPT ADAPTER.JDBC_ADAPTER AS %scriptclass com.exasol.adapter.RequestDispatcher; - %jar /buckets///virtual-schema-dist-5.0.4-bundle-4.0.4.jar; + %jar /buckets///virtual-schema-dist-6.0.0-bundle-4.0.4.jar; %jar /buckets///ngdbc-.jar; / ; @@ -114,4 +114,4 @@ Also here the only solution is to not use it in conjunction with a Virtual Schem ### Column Type `TIME` The type `TIME` always comes to Virtual Schema as a `TIMESTAMP` data type therefore it has not only time, but also date. -For now it is always a current date. Example: 10:30:25 will be 27.06.2019 10:30:25.0 where date is a current date. \ No newline at end of file +For now it is always a current date. Example: 10:30:25 will be 27.06.2019 10:30:25.0 where date is a current date. diff --git a/doc/dialects/sql_server.md b/doc/dialects/sql_server.md index 60dd2ea20..a3f57b33e 100644 --- a/doc/dialects/sql_server.md +++ b/doc/dialects/sql_server.md @@ -46,7 +46,7 @@ The SQL statement below creates the adapter script, defines the Java class that ```sql CREATE OR REPLACE JAVA ADAPTER SCRIPT SCHEMA_FOR_VS_SCRIPT.ADAPTER_SCRIPT_SQLSERVER AS %scriptclass com.exasol.adapter.RequestDispatcher; - %jar /buckets///virtual-schema-dist-5.0.4-bundle-4.0.4.jar; + %jar /buckets///virtual-schema-dist-6.0.0-bundle-4.0.4.jar; %jar /buckets///mssql-jdbc-.jre8.jar; / ``` @@ -127,4 +127,4 @@ In the following matrix you find combinations of JDBC driver and dialect version | Virtual Schema Version | SQL SERVER Version | Driver Name | Driver Version | |------------------------|------------------------------|-------------------|----------------| -| Latest | 2019-CU6-ubuntu-16.04 8.0.20 | MS SQL JDBC JRE 8 | 8.4.0 | \ No newline at end of file +| Latest | 2019-CU6-ubuntu-16.04 8.0.20 | MS SQL JDBC JRE 8 | 8.4.0 | diff --git a/doc/dialects/sybase.md b/doc/dialects/sybase.md index 660a6bbb5..91d6bb822 100644 --- a/doc/dialects/sybase.md +++ b/doc/dialects/sybase.md @@ -29,7 +29,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-5.0.4-bundle-4.0.4.jar; + %jar /buckets///virtual-schema-dist-6.0.0-bundle-4.0.4.jar; %jar /buckets///jtds-.jar; / ``` diff --git a/doc/dialects/teradata.md b/doc/dialects/teradata.md index 56207ca65..8bb5931f2 100644 --- a/doc/dialects/teradata.md +++ b/doc/dialects/teradata.md @@ -47,7 +47,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-5.0.4-bundle-4.0.4.jar; + %jar /buckets///virtual-schema-dist-6.0.0-bundle-4.0.4.jar; %jar /buckets///terajdbc4.jar; %jar /buckets///tdgssconfig.jar; / @@ -76,4 +76,4 @@ CREATE VIRTUAL SCHEMA SQL_DIALECT = 'TERADATA' CONNECTION_NAME = 'TERADATA_CONNECTION' SCHEMA_NAME = ''; -``` \ No newline at end of file +``` diff --git a/pom.xml b/pom.xml index 7f1a2f3f9..d421017d6 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ UTF-8 11 3.0.0-M4 - 5.0.4 + 6.0.0 1.14.3 target/site/jacoco/jacoco.xml,target/site/jacoco-it/jacoco.xml @@ -65,26 +65,26 @@ org.junit.jupiter junit-jupiter - 5.6.2 + 5.7.0 test org.mockito mockito-junit-jupiter - 3.4.6 + 3.5.13 test com.exasol exasol-jdbc - 6.2.5 + 7.0.0 test com.exasol exasol-testcontainers - 2.1.0 + 3.1.0 test @@ -102,7 +102,7 @@ org.postgresql postgresql - 42.2.14 + 42.2.16 org.testcontainers @@ -177,7 +177,7 @@ org.apache.hbase hbase-server - 2.3.1 + 2.3.2 test @@ -218,7 +218,7 @@ com.microsoft.sqlserver mssql-jdbc - 8.4.0.jre11 + 8.4.1.jre11 org.testcontainers @@ -241,13 +241,13 @@ com.exasol test-db-builder-java - 1.0.1 + 1.1.0 test com.exasol hamcrest-resultset-matcher - 1.1.1 + 1.2.1 test diff --git a/src/main/java/com/exasol/adapter/dialects/hive/HiveSqlGenerationVisitor.java b/src/main/java/com/exasol/adapter/dialects/hive/HiveSqlGenerationVisitor.java index 2807aab1d..5fb527189 100644 --- a/src/main/java/com/exasol/adapter/dialects/hive/HiveSqlGenerationVisitor.java +++ b/src/main/java/com/exasol/adapter/dialects/hive/HiveSqlGenerationVisitor.java @@ -192,7 +192,8 @@ private String getChangedSubstringFunction(final SqlFunctionScalar function) thr for (final SqlNode node : arguments) { argumentsSql.add(node.accept(this)); } - if (function.toSimpleSql().toUpperCase().contains("FROM")) { + final String sql = super.visit(function); + if (sql.toUpperCase().contains("FROM")) { final StringBuilder builder = new StringBuilder(); builder.append("SUBSTRING("); builder.append(argumentsSql.get(0)); @@ -201,7 +202,7 @@ private String getChangedSubstringFunction(final SqlFunctionScalar function) thr builder.append(")"); return builder.toString(); } else { - return super.visit(function); + return sql; } } @@ -232,4 +233,4 @@ private String changeDateTrunc(final SqlFunctionScalar function) throws AdapterE exception); } }; -} +} \ No newline at end of file diff --git a/src/main/java/com/exasol/adapter/dialects/sqlserver/SqlServerSqlDialect.java b/src/main/java/com/exasol/adapter/dialects/sqlserver/SqlServerSqlDialect.java index f4c606f29..1321f2497 100644 --- a/src/main/java/com/exasol/adapter/dialects/sqlserver/SqlServerSqlDialect.java +++ b/src/main/java/com/exasol/adapter/dialects/sqlserver/SqlServerSqlDialect.java @@ -47,7 +47,7 @@ private static Capabilities createCapabilityList() { ST_CONTAINS, ST_CONVEXHULL, ST_CROSSES, ST_DIFFERENCE, ST_DIMENSION, ST_DISJOINT, ST_DISTANCE, ST_ENVELOPE, ST_EQUALS, ST_GEOMETRYTYPE, ST_INTERSECTION, ST_INTERSECTS, ST_ISEMPTY, ST_ISSIMPLE, ST_OVERLAPS, ST_SYMDIFFERENCE, ST_TOUCHES, ST_UNION, ST_WITHIN, BIT_AND, BIT_NOT, - BIT_OR, BIT_XOR, CASE, HASH_MD5, HASH_SHA, HASH_SHA1, NULLIFZERO, ZEROIFNULL) + BIT_OR, BIT_XOR, CASE, HASH_MD5, HASH_SHA1, NULLIFZERO, ZEROIFNULL) .build(); } diff --git a/src/main/java/com/exasol/adapter/dialects/sqlserver/SqlServerSqlGenerationVisitor.java b/src/main/java/com/exasol/adapter/dialects/sqlserver/SqlServerSqlGenerationVisitor.java index 3afe23068..a5fdc26e3 100644 --- a/src/main/java/com/exasol/adapter/dialects/sqlserver/SqlServerSqlGenerationVisitor.java +++ b/src/main/java/com/exasol/adapter/dialects/sqlserver/SqlServerSqlGenerationVisitor.java @@ -254,8 +254,6 @@ public String visit(final SqlFunctionScalar function) throws AdapterException { return "CONVERT(Char, HASHBYTES('MD5'," + argumentsSql.get(0) + "), 2)"; case HASH_SHA1: return "CONVERT(Char, HASHBYTES('SHA1'," + argumentsSql.get(0) + "), 2)"; - case HASH_SHA: - return "CONVERT(Char, HASHBYTES('SHA'," + argumentsSql.get(0) + "), 2)"; case ZEROIFNULL: return "ISNULL(" + argumentsSql.get(0) + ",0)"; default: diff --git a/src/main/java/com/exasol/adapter/dialects/sybase/SybaseSqlDialect.java b/src/main/java/com/exasol/adapter/dialects/sybase/SybaseSqlDialect.java index ba78a2089..a6898403d 100644 --- a/src/main/java/com/exasol/adapter/dialects/sybase/SybaseSqlDialect.java +++ b/src/main/java/com/exasol/adapter/dialects/sybase/SybaseSqlDialect.java @@ -49,7 +49,7 @@ private static Capabilities createCapabilityList() { ST_CONTAINS, ST_CONVEXHULL, ST_CROSSES, ST_DIFFERENCE, ST_DIMENSION, ST_DISJOINT, ST_DISTANCE, ST_ENVELOPE, ST_EQUALS, ST_GEOMETRYTYPE, ST_INTERSECTION, ST_INTERSECTS, ST_ISEMPTY, ST_ISSIMPLE, ST_OVERLAPS, ST_SYMDIFFERENCE, ST_TOUCHES, ST_UNION, ST_WITHIN, BIT_AND, BIT_NOT, - BIT_OR, BIT_XOR, CASE, HASH_MD5, HASH_SHA, HASH_SHA1, NULLIFZERO, ZEROIFNULL) + BIT_OR, BIT_XOR, CASE, HASH_MD5, HASH_SHA1, NULLIFZERO, ZEROIFNULL) .build(); } diff --git a/src/main/java/com/exasol/adapter/dialects/sybase/SybaseSqlGenerationVisitor.java b/src/main/java/com/exasol/adapter/dialects/sybase/SybaseSqlGenerationVisitor.java index 996243f21..b12592a3d 100644 --- a/src/main/java/com/exasol/adapter/dialects/sybase/SybaseSqlGenerationVisitor.java +++ b/src/main/java/com/exasol/adapter/dialects/sybase/SybaseSqlGenerationVisitor.java @@ -296,8 +296,6 @@ public String visit(final SqlFunctionScalar function) throws AdapterException { return "CONVERT(Char, HASHBYTES('MD5'," + argumentsSql.get(0) + "), 2)"; case HASH_SHA1: return "CONVERT(Char, HASHBYTES('SHA1'," + argumentsSql.get(0) + "), 2)"; - case HASH_SHA: - return "CONVERT(Char, HASHBYTES('SHA'," + argumentsSql.get(0) + "), 2)"; case ZEROIFNULL: return "ISNULL(" + argumentsSql.get(0) + ",0)"; default: @@ -438,4 +436,4 @@ private String getScalarFunctionWithVarcharCastTwoArguments(final List a return "CAST(" + (argumentsSql.get(0) + function + argumentsSql.get(1) + ")") + "as VARCHAR(" + MAX_SYBASE_VARCHAR_SIZE + ") )"; } -} +} \ No newline at end of file diff --git a/src/test/java/com/exasol/adapter/dialects/IntegrationTestConstants.java b/src/test/java/com/exasol/adapter/dialects/IntegrationTestConstants.java index 42659b875..0768c5db0 100644 --- a/src/test/java/com/exasol/adapter/dialects/IntegrationTestConstants.java +++ b/src/test/java/com/exasol/adapter/dialects/IntegrationTestConstants.java @@ -3,7 +3,8 @@ import java.nio.file.Path; public final class IntegrationTestConstants { - public static final String VIRTUAL_SCHEMAS_JAR_NAME_AND_VERSION = "virtual-schema-dist-5.0.4-bundle-4.0.4.jar"; + public static final String VIRTUAL_SCHEMAS_JAR_NAME_AND_VERSION = "virtual-schema-dist-6.0.0-bundle-4.0.4.jar"; + public static final String EXASOL_DOCKER_IMAGE_REFERENCE = "exasol/docker-db:6.2.9-d1"; public static final Path PATH_TO_VIRTUAL_SCHEMAS_JAR = Path.of("target", VIRTUAL_SCHEMAS_JAR_NAME_AND_VERSION); public static final String SCHEMA_EXASOL = "SCHEMA_EXASOL"; public static final String ADAPTER_SCRIPT_EXASOL = "ADAPTER_SCRIPT_EXASOL"; diff --git a/src/test/java/com/exasol/adapter/dialects/db2/DB2SqlGenerationVisitorTest.java b/src/test/java/com/exasol/adapter/dialects/db2/DB2SqlGenerationVisitorTest.java index 6b44fb993..b6ef9b1ed 100644 --- a/src/test/java/com/exasol/adapter/dialects/db2/DB2SqlGenerationVisitorTest.java +++ b/src/test/java/com/exasol/adapter/dialects/db2/DB2SqlGenerationVisitorTest.java @@ -120,7 +120,7 @@ void testVisitSqlSelectListSelectStarThrowsException() { void testVisitSqlFunctionScalarTrimOneArgument() throws AdapterException { final List arguments = new ArrayList<>(); arguments.add(new SqlLiteralString("test")); - final SqlFunctionScalar sqlFunctionScalar = new SqlFunctionScalar(ScalarFunction.TRIM, arguments, true, false); + final SqlFunctionScalar sqlFunctionScalar = new SqlFunctionScalar(ScalarFunction.TRIM, arguments); assertThat(this.visitor.visit(sqlFunctionScalar), equalTo("TRIM('test')")); } @@ -155,7 +155,7 @@ void testVisitSqlFunctionScalarAddDateValues(final ScalarFunction scalarFunction @ParameterizedTest void testVisitSqlFunctionScalar1(final ScalarFunction scalarFunction, final String expected) throws AdapterException { - final SqlFunctionScalar sqlFunctionScalar = new SqlFunctionScalar(scalarFunction, null, true, false); + final SqlFunctionScalar sqlFunctionScalar = new SqlFunctionScalar(scalarFunction, null); assertThat(this.visitor.visit(sqlFunctionScalar), equalTo(expected)); } diff --git a/src/test/java/com/exasol/adapter/dialects/hive/HiveSqlDialectIT.java b/src/test/java/com/exasol/adapter/dialects/hive/HiveSqlDialectIT.java index 6bf2175af..7d026fd10 100644 --- a/src/test/java/com/exasol/adapter/dialects/hive/HiveSqlDialectIT.java +++ b/src/test/java/com/exasol/adapter/dialects/hive/HiveSqlDialectIT.java @@ -59,7 +59,7 @@ class HiveSqlDialectIT extends AbstractIntegrationTest { Wait.forListeningPort().withStartupTimeout(Duration.ofSeconds(50))); @Container private static final ExasolContainer> exasolContainer = new ExasolContainer<>( - ExasolContainerConstants.EXASOL_DOCKER_IMAGE_REFERENCE) // + EXASOL_DOCKER_IMAGE_REFERENCE) // .withLogConsumer(new Slf4jLogConsumer(LOGGER)); // private static Statement statementExasol; diff --git a/src/test/java/com/exasol/adapter/dialects/hive/HiveSqlGenerationVisitorTest.java b/src/test/java/com/exasol/adapter/dialects/hive/HiveSqlGenerationVisitorTest.java index 8de11474c..a4160e4a1 100644 --- a/src/test/java/com/exasol/adapter/dialects/hive/HiveSqlGenerationVisitorTest.java +++ b/src/test/java/com/exasol/adapter/dialects/hive/HiveSqlGenerationVisitorTest.java @@ -147,7 +147,7 @@ void testVisitSqlFunctionScalarWithCastedFunctions(final ScalarFunction scalarFu final List arguments = new ArrayList<>(); arguments.add(new SqlLiteralDouble(10.5)); arguments.add(new SqlLiteralDouble(10.10)); - final SqlFunctionScalar sqlFunctionScalar = new SqlFunctionScalar(scalarFunction, arguments, true, false); + final SqlFunctionScalar sqlFunctionScalar = new SqlFunctionScalar(scalarFunction, arguments); assertThat(this.visitor.visit(sqlFunctionScalar), equalTo("CAST(" + scalarFunction.name() + "(10.5,10.1) as string)")); } @@ -163,7 +163,7 @@ void testVisitSqlFunctionScalarWithChangedFunctions(final ScalarFunction scalarF final List arguments = new ArrayList<>(); arguments.add(new SqlLiteralDouble(10.5)); arguments.add(new SqlLiteralDouble(10.10)); - final SqlFunctionScalar sqlFunctionScalar = new SqlFunctionScalar(scalarFunction, arguments, true, false); + final SqlFunctionScalar sqlFunctionScalar = new SqlFunctionScalar(scalarFunction, arguments); assertThat(this.visitor.visit(sqlFunctionScalar), equalTo("10.5 " + expectedString + " 10.1")); } @@ -172,8 +172,7 @@ void testVisitSqlFunctionScalarSubstring() throws AdapterException { final List arguments = new ArrayList<>(); arguments.add(new SqlLiteralString("string")); arguments.add(new SqlLiteralDouble(1)); - final SqlFunctionScalar sqlFunctionScalar = new SqlFunctionScalar(ScalarFunction.SUBSTR, arguments, true, - false); + final SqlFunctionScalar sqlFunctionScalar = new SqlFunctionScalar(ScalarFunction.SUBSTR, arguments); assertThat(this.visitor.visit(sqlFunctionScalar), equalTo("SUBSTR('string', 1.0)")); } @@ -186,8 +185,7 @@ void testVisitSqlFunctionScalarSubstringWithFrom() throws AdapterException { @Test void testVisitSqlFunctionScalarCurrentDate() throws AdapterException { - final SqlFunctionScalar sqlFunctionScalar = new SqlFunctionScalar(ScalarFunction.CURRENT_DATE, null, true, - false); + final SqlFunctionScalar sqlFunctionScalar = new SqlFunctionScalar(ScalarFunction.CURRENT_DATE, null); assertThat(this.visitor.visit(sqlFunctionScalar), equalTo("CURRENT_DATE")); } @@ -196,8 +194,7 @@ void testVisitSqlFunctionScalarDataTrunc() throws AdapterException { final List arguments = new ArrayList<>(); arguments.add(new SqlLiteralDate("2019-07-04")); arguments.add(new SqlLiteralString("MM")); - final SqlFunctionScalar sqlFunctionScalar = new SqlFunctionScalar(ScalarFunction.DATE_TRUNC, arguments, true, - false); + final SqlFunctionScalar sqlFunctionScalar = new SqlFunctionScalar(ScalarFunction.DATE_TRUNC, arguments); assertThat(this.visitor.visit(sqlFunctionScalar), equalTo("TRUNC('MM',DATE '2019-07-04')")); } } \ No newline at end of file diff --git a/src/test/java/com/exasol/adapter/dialects/mysql/MySqlSqlDialectIT.java b/src/test/java/com/exasol/adapter/dialects/mysql/MySqlSqlDialectIT.java index dfe15b04f..d45b51a84 100644 --- a/src/test/java/com/exasol/adapter/dialects/mysql/MySqlSqlDialectIT.java +++ b/src/test/java/com/exasol/adapter/dialects/mysql/MySqlSqlDialectIT.java @@ -45,7 +45,7 @@ class MySqlSqlDialectIT extends AbstractIntegrationTest { private static final String VIRTUAL_SCHEMA_JDBC = "VIRTUAL_SCHEMA_JDBC"; @Container private static final ExasolContainer> exasolContainer = new ExasolContainer<>( - ExasolContainerConstants.EXASOL_DOCKER_IMAGE_REFERENCE); + EXASOL_DOCKER_IMAGE_REFERENCE); @Container private static final MySQLContainer mySQLContainer = new MySQLContainer<>(MYSQL_DOCKER_IMAGE_REFERENCE) .withUsername("root").withPassword(""); diff --git a/src/test/java/com/exasol/adapter/dialects/mysql/MySqlSqlGenerationVisitorTest.java b/src/test/java/com/exasol/adapter/dialects/mysql/MySqlSqlGenerationVisitorTest.java index c34a83e46..1bf53bafc 100644 --- a/src/test/java/com/exasol/adapter/dialects/mysql/MySqlSqlGenerationVisitorTest.java +++ b/src/test/java/com/exasol/adapter/dialects/mysql/MySqlSqlGenerationVisitorTest.java @@ -36,7 +36,7 @@ void testRewriteDivFunction() throws AdapterException { final List arguments = new ArrayList<>(); arguments.add(new SqlLiteralDouble(10.5)); arguments.add(new SqlLiteralDouble(10.10)); - final SqlFunctionScalar sqlFunctionScalar = new SqlFunctionScalar(ScalarFunction.DIV, arguments, true, false); + final SqlFunctionScalar sqlFunctionScalar = new SqlFunctionScalar(ScalarFunction.DIV, arguments); assertThat(this.visitor.visit(sqlFunctionScalar), equalTo("10.5 DIV 10.1")); } } \ No newline at end of file diff --git a/src/test/java/com/exasol/adapter/dialects/oracle/OracleSqlDialectIT.java b/src/test/java/com/exasol/adapter/dialects/oracle/OracleSqlDialectIT.java index 31b2b2cb9..fd161ad90 100644 --- a/src/test/java/com/exasol/adapter/dialects/oracle/OracleSqlDialectIT.java +++ b/src/test/java/com/exasol/adapter/dialects/oracle/OracleSqlDialectIT.java @@ -61,7 +61,7 @@ class OracleSqlDialectIT extends AbstractIntegrationTest { private static final String VIRTUAL_SCHEMA_ORA_NUMBER_TO_DECIMAL = "VIRTUAL_SCHEMA_ORA_NUMBER_TO_DECIMAL"; @Container private static final ExasolContainer> exasolContainer = new ExasolContainer<>( - ExasolContainerConstants.EXASOL_DOCKER_IMAGE_REFERENCE) // + EXASOL_DOCKER_IMAGE_REFERENCE) // .withLogConsumer(new Slf4jLogConsumer(LOGGER)); @Container private static final OracleContainer oracleContainer = new OracleContainer(ORACLE_CONTAINER_NAME); diff --git a/src/test/java/com/exasol/adapter/dialects/oracle/OracleSqlGenerationVisitorTest.java b/src/test/java/com/exasol/adapter/dialects/oracle/OracleSqlGenerationVisitorTest.java index 35d3a7e78..03b113d76 100644 --- a/src/test/java/com/exasol/adapter/dialects/oracle/OracleSqlGenerationVisitorTest.java +++ b/src/test/java/com/exasol/adapter/dialects/oracle/OracleSqlGenerationVisitorTest.java @@ -247,7 +247,7 @@ void testVisitSqlFunctionScalarLocateThreeArguments() throws AdapterException { arguments.add(new SqlLiteralString("ab ")); arguments.add(new SqlLiteralString("ab cdef")); arguments.add(new SqlLiteralString("ab cdef rty")); - final SqlFunctionScalar sqlFunctionScalar = new SqlFunctionScalar(LOCATE, arguments, true, false); + final SqlFunctionScalar sqlFunctionScalar = new SqlFunctionScalar(LOCATE, arguments); assertThat(this.visitor.visit(sqlFunctionScalar), equalTo("INSTR('ab cdef', 'ab ', 'ab cdef rty')")); } @@ -255,7 +255,7 @@ void testVisitSqlFunctionScalarLocateThreeArguments() throws AdapterException { void testVisitSqlFunctionScalarTrimOneArgument() throws AdapterException { final List arguments = new ArrayList<>(); arguments.add(new SqlLiteralString("test")); - final SqlFunctionScalar sqlFunctionScalar = new SqlFunctionScalar(TRIM, arguments, true, false); + final SqlFunctionScalar sqlFunctionScalar = new SqlFunctionScalar(TRIM, arguments); assertThat(this.visitor.visit(sqlFunctionScalar), equalTo("TRIM('test')")); } @@ -289,7 +289,7 @@ void testVisitSqlFunctionScalarAddDateValues(final ScalarFunction scalarFunction @ParameterizedTest void testVisitSqlFunctionScalar1(final ScalarFunction scalarFunction, final String expected) throws AdapterException { - final SqlFunctionScalar sqlFunctionScalar = new SqlFunctionScalar(scalarFunction, null, true, false); + final SqlFunctionScalar sqlFunctionScalar = new SqlFunctionScalar(scalarFunction, null); assertThat(this.visitor.visit(sqlFunctionScalar), equalTo(expected)); } diff --git a/src/test/java/com/exasol/adapter/dialects/postgresql/PostgreSQLSqlDialectIT.java b/src/test/java/com/exasol/adapter/dialects/postgresql/PostgreSQLSqlDialectIT.java index c84ed1dd3..942b37912 100644 --- a/src/test/java/com/exasol/adapter/dialects/postgresql/PostgreSQLSqlDialectIT.java +++ b/src/test/java/com/exasol/adapter/dialects/postgresql/PostgreSQLSqlDialectIT.java @@ -58,7 +58,7 @@ class PostgreSQLSqlDialectIT extends AbstractIntegrationTest { POSTGRES_CONTAINER_NAME); @Container private static final ExasolContainer> exasolContainer = new ExasolContainer<>( - ExasolContainerConstants.EXASOL_DOCKER_IMAGE_REFERENCE) // + EXASOL_DOCKER_IMAGE_REFERENCE) // .withLogConsumer(new Slf4jLogConsumer(LOGGER)); private static Statement statementExasol; private static ExasolObjectFactory exasolFactory; diff --git a/src/test/java/com/exasol/adapter/dialects/sqlserver/SqlServerSqlDialectIT.java b/src/test/java/com/exasol/adapter/dialects/sqlserver/SqlServerSqlDialectIT.java index e41155a25..d4a742a50 100644 --- a/src/test/java/com/exasol/adapter/dialects/sqlserver/SqlServerSqlDialectIT.java +++ b/src/test/java/com/exasol/adapter/dialects/sqlserver/SqlServerSqlDialectIT.java @@ -48,7 +48,7 @@ class SqlServerSqlDialectIT extends AbstractIntegrationTest { MS_SQL_SERVER_CONTAINER_NAME); @Container private static final ExasolContainer> EXASOL_CONTAINER = new ExasolContainer<>( - ExasolContainerConstants.EXASOL_DOCKER_IMAGE_REFERENCE) // + EXASOL_DOCKER_IMAGE_REFERENCE) // .withLogConsumer(new Slf4jLogConsumer(LOGGER)); @Override diff --git a/src/test/java/com/exasol/adapter/dialects/sqlserver/SqlServerSqlDialectTest.java b/src/test/java/com/exasol/adapter/dialects/sqlserver/SqlServerSqlDialectTest.java index 50b0e484b..c31b09614 100644 --- a/src/test/java/com/exasol/adapter/dialects/sqlserver/SqlServerSqlDialectTest.java +++ b/src/test/java/com/exasol/adapter/dialects/sqlserver/SqlServerSqlDialectTest.java @@ -73,7 +73,7 @@ void testGetCapabilities() { ST_DIFFERENCE, ST_DIMENSION, ST_DISJOINT, ST_DISTANCE, ST_ENVELOPE, ST_EQUALS, ST_GEOMETRYTYPE, ST_INTERSECTION, ST_INTERSECTS, ST_ISEMPTY, ST_ISSIMPLE, ST_OVERLAPS, ST_SYMDIFFERENCE, ST_TOUCHES, ST_UNION, ST_WITHIN, BIT_AND, BIT_NOT, BIT_OR, BIT_XOR, - CASE, HASH_MD5, HASH_SHA, HASH_SHA1, NULLIFZERO, ZEROIFNULL))); + CASE, HASH_MD5, HASH_SHA1, NULLIFZERO, ZEROIFNULL))); } @Test diff --git a/src/test/java/com/exasol/adapter/dialects/sqlserver/SqlServerSqlGenerationVisitorTest.java b/src/test/java/com/exasol/adapter/dialects/sqlserver/SqlServerSqlGenerationVisitorTest.java index ac622e055..3639d96b7 100644 --- a/src/test/java/com/exasol/adapter/dialects/sqlserver/SqlServerSqlGenerationVisitorTest.java +++ b/src/test/java/com/exasol/adapter/dialects/sqlserver/SqlServerSqlGenerationVisitorTest.java @@ -102,7 +102,7 @@ void testVisitSqlFunctionScalarTimeBetween(final ScalarFunction scalarFunction, @ParameterizedTest void testVisitSqlFunctionScalarWithoutArguments(final ScalarFunction scalarFunction, final String expected) throws AdapterException { - final SqlFunctionScalar sqlFunctionScalar = new SqlFunctionScalar(scalarFunction, null, true, false); + final SqlFunctionScalar sqlFunctionScalar = new SqlFunctionScalar(scalarFunction, null); assertThat(this.visitor.visit(sqlFunctionScalar), equalTo(expected)); } @@ -117,7 +117,7 @@ void testVisitSqlFunctionScalarWithThreeArguments(final ScalarFunction scalarFun arguments.add(new SqlLiteralString("test")); arguments.add(new SqlLiteralString("test2")); arguments.add(new SqlLiteralString("test3")); - final SqlFunctionScalar sqlFunctionScalar = new SqlFunctionScalar(scalarFunction, arguments, true, false); + final SqlFunctionScalar sqlFunctionScalar = new SqlFunctionScalar(scalarFunction, arguments); assertThat(this.visitor.visit(sqlFunctionScalar), equalTo(expected)); } @@ -164,7 +164,6 @@ void testVisitSqlFunctionScalarWithThreeArguments(final ScalarFunction scalarFun "BIT_NOT : ~ 'left'", // "HASH_MD5 : CONVERT(Char, HASHBYTES('MD5','left'), 2)", // "HASH_SHA1 : CONVERT(Char, HASHBYTES('SHA1','left'), 2)", // - "HASH_SHA : CONVERT(Char, HASHBYTES('SHA','left'), 2)", // "ZEROIFNULL : ISNULL('left',0)" // }, delimiter = ':') @ParameterizedTest diff --git a/src/test/java/com/exasol/adapter/dialects/sybase/SybaseSqlDialectTest.java b/src/test/java/com/exasol/adapter/dialects/sybase/SybaseSqlDialectTest.java index 85bbffd4d..edbd90dec 100644 --- a/src/test/java/com/exasol/adapter/dialects/sybase/SybaseSqlDialectTest.java +++ b/src/test/java/com/exasol/adapter/dialects/sybase/SybaseSqlDialectTest.java @@ -68,7 +68,7 @@ void testGetCapabilities() { ST_DIFFERENCE, ST_DIMENSION, ST_DISJOINT, ST_DISTANCE, ST_ENVELOPE, ST_EQUALS, ST_GEOMETRYTYPE, ST_INTERSECTION, ST_INTERSECTS, ST_ISEMPTY, ST_ISSIMPLE, ST_OVERLAPS, ST_SYMDIFFERENCE, ST_TOUCHES, ST_UNION, ST_WITHIN, BIT_AND, BIT_NOT, BIT_OR, BIT_XOR, - CASE, HASH_MD5, HASH_SHA, HASH_SHA1, NULLIFZERO, ZEROIFNULL))); + CASE, HASH_MD5, HASH_SHA1, NULLIFZERO, ZEROIFNULL))); } @Test diff --git a/src/test/java/com/exasol/adapter/dialects/sybase/SybaseSqlGenerationVisitorTest.java b/src/test/java/com/exasol/adapter/dialects/sybase/SybaseSqlGenerationVisitorTest.java index f12356258..04ff0475a 100644 --- a/src/test/java/com/exasol/adapter/dialects/sybase/SybaseSqlGenerationVisitorTest.java +++ b/src/test/java/com/exasol/adapter/dialects/sybase/SybaseSqlGenerationVisitorTest.java @@ -126,7 +126,7 @@ void testVisitSqlFunctionScalarTimeBetween(final ScalarFunction scalarFunction, @ParameterizedTest void testVisitSqlFunctionScalarWithoutArguments(final ScalarFunction scalarFunction, final String expected) throws AdapterException { - final SqlFunctionScalar sqlFunctionScalar = new SqlFunctionScalar(scalarFunction, null, true, false); + final SqlFunctionScalar sqlFunctionScalar = new SqlFunctionScalar(scalarFunction, null); assertThat(this.visitor.visit(sqlFunctionScalar), equalTo(expected)); } @@ -141,7 +141,7 @@ void testVisitSqlFunctionScalarWithThreeArguments(final ScalarFunction scalarFun arguments.add(new SqlLiteralString("test")); arguments.add(new SqlLiteralString("test2")); arguments.add(new SqlLiteralString("test3")); - final SqlFunctionScalar sqlFunctionScalar = new SqlFunctionScalar(scalarFunction, arguments, true, false); + final SqlFunctionScalar sqlFunctionScalar = new SqlFunctionScalar(scalarFunction, arguments); assertThat(this.visitor.visit(sqlFunctionScalar), equalTo(expected)); } @@ -188,7 +188,6 @@ void testVisitSqlFunctionScalarWithThreeArguments(final ScalarFunction scalarFun "BIT_NOT : ~ 'left'", // "HASH_MD5 : CONVERT(Char, HASHBYTES('MD5','left'), 2)", // "HASH_SHA1 : CONVERT(Char, HASHBYTES('SHA1','left'), 2)", // - "HASH_SHA : CONVERT(Char, HASHBYTES('SHA','left'), 2)", // "ZEROIFNULL : ISNULL('left',0)" // }, delimiter = ':') @ParameterizedTest diff --git a/src/test/java/utils/SqlNodesCreator.java b/src/test/java/utils/SqlNodesCreator.java index 72963ae80..421720c74 100644 --- a/src/test/java/utils/SqlNodesCreator.java +++ b/src/test/java/utils/SqlNodesCreator.java @@ -60,7 +60,7 @@ public static SqlFunctionScalar createSqlFunctionScalarWithTwoStringArguments(fi final List arguments = new ArrayList<>(); arguments.add(new SqlLiteralString(argument1)); arguments.add(new SqlLiteralString(argument2)); - return new SqlFunctionScalar(scalarFunction, arguments, true, false); + return new SqlFunctionScalar(scalarFunction, arguments); } public static SqlFunctionScalar createSqlFunctionScalarForDateTest(final ScalarFunction scalarFunction, @@ -71,7 +71,7 @@ public static SqlFunctionScalar createSqlFunctionScalarForDateTest(final ScalarF .adapterNotes("{\"jdbcDataType\":93, " + "\"typeName\":\"TIMESTAMP\"}") .type(DataType.createChar(20, DataType.ExaCharset.UTF8)).build())); arguments.add(new SqlLiteralExactnumeric(new BigDecimal(numericValue))); - return new SqlFunctionScalar(scalarFunction, arguments, true, false); + return new SqlFunctionScalar(scalarFunction, arguments); } public static SqlSelectList createSqlSelectStarListWithOneColumn(final String adapterNotes, final DataType dataType, @@ -91,4 +91,4 @@ public static SqlSelectList createSqlSelectStarListWithoutColumns() { sqlSelectList.setParent(sqlStatementSelect); return sqlSelectList; } -} +} \ No newline at end of file