diff --git a/.gitignore b/.gitignore index 2adcae75f..cef7a2550 100644 --- a/.gitignore +++ b/.gitignore @@ -16,7 +16,7 @@ dependency-reduced-pom.xml # Others .DS_Store *.swp -**/local +local Scripts .dbeaver* **/*.log \ No newline at end of file diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/.settings/org.eclipse.core.resources.prefs rename to .settings/org.eclipse.core.resources.prefs diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/.settings/org.eclipse.jdt.core.prefs rename to .settings/org.eclipse.jdt.core.prefs diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/.settings/org.eclipse.jdt.ui.prefs b/.settings/org.eclipse.jdt.ui.prefs similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/.settings/org.eclipse.jdt.ui.prefs rename to .settings/org.eclipse.jdt.ui.prefs diff --git a/.settings/org.eclipse.m2e.core.prefs b/.settings/org.eclipse.m2e.core.prefs new file mode 100644 index 000000000..f897a7f1c --- /dev/null +++ b/.settings/org.eclipse.m2e.core.prefs @@ -0,0 +1,4 @@ +activeProfiles= +eclipse.preferences.version=1 +resolveWorkspaceProjects=true +version=1 diff --git a/.travis.yml b/.travis.yml index 43a55549a..e266385f9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,25 +11,21 @@ matrix: include: - jdk: "openjdk11" - addons: sonarcloud: organization: exasol before_script: + - tools/version.sh verify - sudo pip install pipenv - - ./jdbc-adapter/tools/version.sh verify - + install: - - cd jdbc-adapter/virtualschema-jdbc-adapter - travis_retry mvn dependency:resolve - - cd ../.. script: - - ./jdbc-adapter/integration-test-data/run_integration_tests.sh - - cd jdbc-adapter + - integration-test-data/run_integration_tests.sh - mvn clean org.jacoco:jacoco-maven-plugin:prepare-agent install sonar:sonar cache: directories: - - $HOME/.m2 \ No newline at end of file + - "$HOME/.m2" diff --git a/README.md b/README.md index 9e3c6212f..75d9fced9 100644 --- a/README.md +++ b/README.md @@ -6,17 +6,17 @@ SonarCloud results: -[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=com.exasol%3Avirtualschema-jdbc-adapter-main&metric=alert_status)](https://sonarcloud.io/dashboard?id=com.exasol%3Avirtualschema-jdbc-adapter-main) +[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=com.exasol%3Avirtual-schema-jdbc-adapter&metric=alert_status)](https://sonarcloud.io/dashboard?id=com.exasol%3Avirtual-schema-jdbc-adapter) -[![Security Rating](https://sonarcloud.io/api/project_badges/measure?project=com.exasol%3Avirtualschema-jdbc-adapter-main&metric=security_rating)](https://sonarcloud.io/dashboard?id=com.exasol%3Avirtualschema-jdbc-adapter-main) -[![Reliability Rating](https://sonarcloud.io/api/project_badges/measure?project=com.exasol%3Avirtualschema-jdbc-adapter-main&metric=reliability_rating)](https://sonarcloud.io/dashboard?id=com.exasol%3Avirtualschema-jdbc-adapter-main) -[![Maintainability Rating](https://sonarcloud.io/api/project_badges/measure?project=com.exasol%3Avirtualschema-jdbc-adapter-main&metric=sqale_rating)](https://sonarcloud.io/dashboard?id=com.exasol%3Avirtualschema-jdbc-adapter-main) -[![Technical Debt](https://sonarcloud.io/api/project_badges/measure?project=com.exasol%3Avirtualschema-jdbc-adapter-main&metric=sqale_index)](https://sonarcloud.io/dashboard?id=com.exasol%3Avirtualschema-jdbc-adapter-main) +[![Security Rating](https://sonarcloud.io/api/project_badges/measure?project=com.exasol%3Avirtual-schema-jdbc-adapter&metric=security_rating)](https://sonarcloud.io/dashboard?id=com.exasol%3Avirtual-schema-jdbc-adapter) +[![Reliability Rating](https://sonarcloud.io/api/project_badges/measure?project=com.exasol%3Avirtual-schema-jdbc-adapter&metric=reliability_rating)](https://sonarcloud.io/dashboard?id=com.exasol%3Avirtual-schema-jdbc-adapter) +[![Maintainability Rating](https://sonarcloud.io/api/project_badges/measure?project=com.exasol%3Avirtual-schema-jdbc-adapter&metric=sqale_rating)](https://sonarcloud.io/dashboard?id=com.exasol%3Avirtual-schema-jdbc-adapter) +[![Technical Debt](https://sonarcloud.io/api/project_badges/measure?project=com.exasol%3Avirtual-schema-jdbc-adapter&metric=sqale_index)](https://sonarcloud.io/dashboard?id=com.exasol%3Avirtual-schema-jdbc-adapter) -[![Code Smells](https://sonarcloud.io/api/project_badges/measure?project=com.exasol%3Avirtualschema-jdbc-adapter-main&metric=code_smells)](https://sonarcloud.io/dashboard?id=com.exasol%3Avirtualschema-jdbc-adapter-main) -[![Coverage](https://sonarcloud.io/api/project_badges/measure?project=com.exasol%3Avirtualschema-jdbc-adapter-main&metric=coverage)](https://sonarcloud.io/dashboard?id=com.exasol%3Avirtualschema-jdbc-adapter-main) -[![Duplicated Lines (%)](https://sonarcloud.io/api/project_badges/measure?project=com.exasol%3Avirtualschema-jdbc-adapter-main&metric=duplicated_lines_density)](https://sonarcloud.io/dashboard?id=com.exasol%3Avirtualschema-jdbc-adapter-main) -[![Lines of Code](https://sonarcloud.io/api/project_badges/measure?project=com.exasol%3Avirtualschema-jdbc-adapter-main&metric=ncloc)](https://sonarcloud.io/dashboard?id=com.exasol%3Avirtualschema-jdbc-adapter-main) +[![Code Smells](https://sonarcloud.io/api/project_badges/measure?project=com.exasol%3Avirtual-schema-jdbc-adapter&metric=code_smells)](https://sonarcloud.io/dashboard?id=com.exasol%3Avirtual-schema-jdbc-adapter) +[![Coverage](https://sonarcloud.io/api/project_badges/measure?project=com.exasol%3Avirtual-schema-jdbc-adapter&metric=coverage)](https://sonarcloud.io/dashboard?id=com.exasol%3Avirtual-schema-jdbc-adapter) +[![Duplicated Lines (%)](https://sonarcloud.io/api/project_badges/measure?project=com.exasol%3Avirtual-schema-jdbc-adapter&metric=duplicated_lines_density)](https://sonarcloud.io/dashboard?id=com.exasol%3Avirtual-schema-jdbc-adapter) +[![Lines of Code](https://sonarcloud.io/api/project_badges/measure?project=com.exasol%3Avirtual-schema-jdbc-adapter&metric=ncloc)](https://sonarcloud.io/dashboard?id=com.exasol%3Avirtual-schema-jdbc-adapter) # Overview diff --git a/assembly/all-dependencies.xml b/assembly/all-dependencies.xml new file mode 100644 index 000000000..075aa0dcd --- /dev/null +++ b/assembly/all-dependencies.xml @@ -0,0 +1,22 @@ + + all-dependencies + + jar + + false + + + + metaInf-services + + + + + true + runtime + / + + + diff --git a/doc/development/developing-sql-dialect/developing_a_dialect.md b/doc/development/developing-sql-dialect/developing_a_dialect.md index 1943b5fdb..86575cbad 100644 --- a/doc/development/developing-sql-dialect/developing_a_dialect.md +++ b/doc/development/developing-sql-dialect/developing_a_dialect.md @@ -53,28 +53,25 @@ If you want to write an SQL dialect, you need to start by implementing the diale ### Project Structure -This repository contains Maven sub-projects that are structured as follows. +This repository is structured as follows. - jdbc-adapter Parent project and integration test framework + virtual-schemas | - |-- virtualschema-jdbc-adapter The actual implementation files + | + |-- src | | - | |-- src + | |-- main | | | - | | |-- main - | | | | - | | | |-- java Productive code - | | | | - | | | '-- resources Productive resources (e.g. service loader configuration) + | | |-- java Productive code | | | - | | '-- test - | | | - | | |-- java Unit and integration tests - | | | - | | '-- resources Test resources + | | '-- resources Productive resources (e.g. service loader configuration) + | | + | '-- test + | | + | |-- java Unit and integration tests + | | + | '-- resources Test resources | ... - | - '-- virtualschema-jdbc-adapter-dist Environment for creating the all-in-one adapter JAR ### Package Structure @@ -98,18 +95,18 @@ The Java package structure of the `virtualschema-jdbc-adapter` reflects the sepa | Interface | Implementation | Purpose | |-------------------------------------------------------------------------------------------------------------------------------------------------------------------|-------------------------------|----------------------------------------------------------------------------------------| -| [`com.exasol.adapter.dialects.SqlDialect`](../../../jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/SqlDialect.java) | mandatory | Define capabilities and which kind of support the dialect has for catalogs and schemas | -| [`com.exasol.adapter.dialects.SqlDialectFactory`](../../../jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/SqlDialectFactory.java) | mandatory | Provide a way to instantiate the SQL dialect | -| [`com.exasol.adapter.jdbc.RemoteMetadataReader`](../../../jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/jdbc/RemoteMetadataReader.java) | optional depending on dialect | Read top-level metadata and find remote tables | -| [`com.exasol.adapter.jdbc.TableMetadataReader`](../../../jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/jdbc/TableMetadataReader.java) | optional depending on dialect | Decide which tables should be mapped and map data on table level | -| [`com.exasol.adapter.jdbc.ColumnMetadataReader`](../../../jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/jdbc/ColumnMetadataReader.java) | optional depending on dialect | Map data on column level | -| [`com.exasol.adapter.dialects.QueryRewriter`](../../../jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/QueryRewriter.java) | optional depending on dialect | Rewrite the original query into a dialect-specific one | +| [`com.exasol.adapter.dialects.SqlDialect`](https://github.com/exasol/virtual-schema-common-jdbc/blob/master/src/main/java/com/exasol/adapter/dialects/SqlDialect.java) | mandatory | Define capabilities and which kind of support the dialect has for catalogs and schemas | +| [`com.exasol.adapter.dialects.SqlDialectFactory`](https://github.com/exasol/virtual-schema-common-jdbc/blob/master/src/main/java/com/exasol/adapter/dialects/SqlDialectFactory.java) | mandatory | Provide a way to instantiate the SQL dialect | +| [`com.exasol.adapter.jdbc.RemoteMetadataReader`](https://github.com/exasol/virtual-schema-common-jdbc/blob/master/src/main/java/com/exasol/adapter/jdbc/RemoteMetadataReader.java) | optional depending on dialect | Read top-level metadata and find remote tables | +| [`com.exasol.adapter.jdbc.TableMetadataReader`](https://github.com/exasol/virtual-schema-common-jdbc/blob/master/src/main/java/com/exasol/adapter/jdbc/TableMetadataReader.java) | optional depending on dialect | Decide which tables should be mapped and map data on table level | +| [`com.exasol.adapter.jdbc.ColumnMetadataReader`](https://github.com/exasol/virtual-schema-common-jdbc/blob/master/src/main/java/com/exasol/adapter/jdbc/ColumnMetadataReader.java) | optional depending on dialect | Map data on column level | +| [`com.exasol.adapter.dialects.QueryRewriter`](https://github.com/exasol/virtual-schema-common-jdbc/blob/master/src/main/java/com/exasol/adapter/dialects/QueryRewriter.java) | optional depending on dialect | Rewrite the original query into a dialect-specific one | ### Registering the Dialect The Virtual Schema adapter creates an instance of an SQL dialect on demand. You can pick any dialect that is listed in the `SqlDialects` registry. Each dialect needs a factory that can create an instance of that dialect. That factory must implement the interface 'SqlDialectFactory'. -We use Java's [Service Loader](https://docs.oracle.com/javase/8/docs/api/java/util/ServiceLoader.html) in order to load the dialect implementation. That means you need to register the factory of your new dialect as a service on the list in [`com.exasol.adapter.dialects.SqlDialectFactory`](../../../jdbc-adapter/virtualschema-jdbc-adapter/src/main/resources/META-INF/services/com.exasol.adapter.dialects.SqlDialectFactory). +We use Java's [Service Loader](https://docs.oracle.com/javase/8/docs/api/java/util/ServiceLoader.html) in order to load the dialect implementation. That means you need to register the factory of your new dialect as a service on the list in [`com.exasol.adapter.dialects.SqlDialectFactory`](https://github.com/exasol/virtual-schema-common-jdbc/blob/master/src/main/java/com/exasol/adapter/dialects/SqlDialectFactory.java). ```properties com.exasol.adapter.dialects.athena.AthenaSqlDialectFactory diff --git a/doc/development/developing-sql-dialect/implementing_mandatory_sql_dialect_classes.md b/doc/development/developing-sql-dialect/implementing_mandatory_sql_dialect_classes.md index eecd0894c..dfc2f3495 100644 --- a/doc/development/developing-sql-dialect/implementing_mandatory_sql_dialect_classes.md +++ b/doc/development/developing-sql-dialect/implementing_mandatory_sql_dialect_classes.md @@ -358,7 +358,7 @@ And we also need two corresponding test classes: Each dialect is accompanied by a factory that is responsible for instantiating that dialect. The [Java Service](https://docs.oracle.com/javase/8/docs/api/java/util/ServiceLoader.html) loader takes care of finding and loading the factory. -It looks up the fully qualified class name of the dialect factories in the file [`com.exasol.adapter.dialects.SqlDialectFactory`](../../../jdbc-adapter/virtualschema-jdbc-adapter/src/main/resources/META-INF/services/com.exasol.adapter.dialects.SqlDialectFactory). +It looks up the fully qualified class name of the dialect factories in the file [`com.exasol.adapter.dialects.SqlDialectFactory`](https://github.com/exasol/virtual-schema-common-jdbc/blob/master/src/main/java/com/exasol/adapter/dialects/SqlDialectFactory.java). 1. Now **create a class for the factory**: `com.exasol.adapter.dialects.athena.AthenaSqlDialectFactory` that **implements** `SqlDialectFactory`. Let your IDE to generate necessary **overriding methods** for you. diff --git a/doc/development/developing-sql-dialect/integration_testing_with_containers.md b/doc/development/developing-sql-dialect/integration_testing_with_containers.md index ec429032b..19774aa0c 100644 --- a/doc/development/developing-sql-dialect/integration_testing_with_containers.md +++ b/doc/development/developing-sql-dialect/integration_testing_with_containers.md @@ -21,7 +21,7 @@ What you need is, for each source database: ## Preparing Integration Test -1. In order to run the integration test automated, edit the [Travis CI integration test configuration file](../../../jdbc-adapter/integration-test-data/integration-test-travis.yaml) and add your new database. +1. In order to run the integration test automated, edit the [Travis CI integration test configuration file](../../../integration-test-data/integration-test-travis.yaml) and add your new database. 2. Provide a JDBC driver JAR for the source database. 3. Add a new Integration Test class for you database @@ -43,21 +43,21 @@ Set the following properties for your database: ### Provide JDBC drivers for the Source Database -The JDBC drivers are automatically deployed during the test. You have to create a directory for the jdbc driver under integration-test-data/drivers. The folder contains the driver jar file(s) and a config file. See the [PostgreSQL config](../../../jdbc-adapter/integration-test-data/drivers/POSTGRESQL/settings.cfg) for an example. +The JDBC drivers are automatically deployed during the test. You have to create a directory for the jdbc driver under integration-test-data/drivers. The folder contains the driver jar file(s) and a config file. See the [PostgreSQL config](../../../integration-test-data/drivers/POSTGRESQL/settings.cfg) for an example. -In order to connect to the source database from your integration test you also have to add the jdbc driver dependency to the [POM](../../../jdbc-adapter/virtualschema-jdbc-adapter/pom.xml) scope verify. +In order to connect to the source database from your integration test you also have to add the jdbc driver dependency to the [POM](../../../pom.xml) scope verify. ### Add a new Integration Test Class -Add a new class that derives from [AbstractIntegrationTest](../../../jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/AbstractIntegrationTest.java). This class has to: +Add a new class that derives from [AbstractIntegrationTest](../../../src/test/java/com/exasol/adapter/dialects/AbstractIntegrationTest.java). This class has to: * Create the test schema in the source database * Create the virtual schema * Execute the tests on the virtual schema -See [PostgreSQLDialectIT](../../../jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/postgresql/PostgreSQLSqlDialectIT.java) for an example. +See [PostgreSQLDialectIT](../../../src/test/java/com/exasol/adapter/dialects/postgresql/PostgreSQLSqlDialectIT.java) for an example. ## Executing Integration Tests -Executing the integration test is easy, just run the [integration test bash script](../../../jdbc-adapter/integration-test-data/run_integration_tests.sh) +Executing the integration test is easy, just run the [integration test bash script](../../../integration-test-data/run_integration_tests.sh) # Integration Testing Against a Local Database @@ -96,7 +96,7 @@ If BucketFS is new to you, there are nice [training videos on BucketFS](https:// 1. Create a dedicated user in the source database that has the necessary access privileges 2. Create credentials for the user under which the integration tests run at the source -3. Make a local copy of the [sample integration test configuration file](../../../jdbc-adapter/integration-test-data/integration-test-sample.yaml) in a place where you don't accidentally check this file in. +3. Make a local copy of the [sample integration test configuration file](../../../integration-test-data/integration-test-sample.yaml) in a place where you don't accidentally check this file in. 4. Edit the credentials information 5. [Deploy the JDBC driver(s)](../../user-guide/deploying_the_virtual_schema_adapter.md#deploying-jdbc-driver-files) to the prepared bucket in Exasol's BucketFS diff --git a/doc/development/remote_debugging.md b/doc/development/remote_debugging.md index 7d18371e7..2e940a470 100644 --- a/doc/development/remote_debugging.md +++ b/doc/development/remote_debugging.md @@ -77,7 +77,7 @@ You can see the filled out configuration dialog below. ![Eclipse remote debugging settings](../images/Screenshot_Eclipse_remote_debugging.png) -You can find the example configuration above in the collection of launch configurations under [`jdbc-adapter/launch`](../../jdbc-adapter/launch/virtual-schema%20debug%20listen%20on%20port%208000.launch). +You can find the example configuration above in the collection of launch configurations under [`jdbc-adapter/launch`](../../launch/virtual-schema%20debug%20listen%20on%20port%208000.launch). ## Configuring the Virtual Schema for Remote Debugging diff --git a/doc/dialects/athena.md b/doc/dialects/athena.md index a4efb73ec..defd6861f 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///virtualschema-jdbc-adapter-dist-3.0.0.jar; + %jar /buckets///virtualschema-jdbc-adapter-dist-3.0.1.jar; %jar /buckets///AthenaJDBC42-.jar; / ; diff --git a/doc/dialects/aurora.md b/doc/dialects/aurora.md index c2a7b7eae..48ae0ce6d 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///virtualschema-jdbc-adapter-dist-3.0.0.jar; + %jar /buckets///virtualschema-jdbc-adapter-dist-3.0.1.jar; %jar /buckets///postgresql-.jar; / ``` diff --git a/doc/dialects/bigquery.md b/doc/dialects/bigquery.md index eca8b7102..c7d276686 100644 --- a/doc/dialects/bigquery.md +++ b/doc/dialects/bigquery.md @@ -28,7 +28,7 @@ Please remember to check the versions of your JAR files after downloading driver ```sql CREATE JAVA ADAPTER SCRIPT ADAPTER.JDBC_ADAPTER AS %scriptclass com.exasol.adapter.RequestDispatcher; - %jar /buckets///virtualschema-jdbc-adapter-dist-3.0.0.jar; + %jar /buckets///virtualschema-jdbc-adapter-dist-3.0.1.jar; %jar /buckets///avro-1.8.2.jar; %jar /buckets///gax-1.40.0.jar; %jar /buckets///google-api-client-1.28.0.jar; @@ -50,7 +50,7 @@ CREATE JAVA ADAPTER SCRIPT ADAPTER.JDBC_ADAPTER AS ## Defining a Named Connection -Please follow the [Authenticating to a Cloud API Service article](https://cloud.google.com/video-intelligence/docs/common/auth]) to get Google service account credentials. +Please follow the [Authenticating to a Cloud API Service article](https://cloud.google.com/docs/authentication/) to get Google service account credentials. Upload the key to BucketFS, then create a named connection: @@ -58,7 +58,7 @@ Upload the key to BucketFS, then create a named connection: CREATE OR REPLACE CONNECTION BIGQUERY_CONNECTION TO 'jdbc:bigquery://https://www.googleapis.com/bigquery/v2:443;ProjectId=;OAuthType=0;OAuthServiceAcctEmail=;OAuthPvtKeyPath=//'; ``` -You can find additional information about the [JDBC connection string in the Big Query JDBC installation guide](https://www.simba.com/products/BigQuery/doc/JDBC_InstallGuide/content/jdbc/bq/authenticating/serviceaccount.htm]); +You can find additional information about the [JDBC connection string in the Big Query JDBC installation guide](https://www.simba.com/products/BigQuery/doc/JDBC_InstallGuide/content/jdbc/using/intro.htm); ## Creating a Virtual Schema diff --git a/doc/dialects/db2.md b/doc/dialects/db2.md index b773a5022..66f31b959 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///virtualschema-jdbc-adapter-dist-3.0.0.jar; + %jar /buckets///virtualschema-jdbc-adapter-dist-3.0.1.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///virtualschema-jdbc-adapter-dist-3.0.0.jar; + %jar /buckets///virtualschema-jdbc-adapter-dist-3.0.1.jar; %jar /buckets///db2jcc4.jar; %jar /buckets///db2jcc_license_cu.jar; %jar /buckets///db2jcc_license_cisuz.jar; diff --git a/doc/dialects/exasol.md b/doc/dialects/exasol.md index 216923a73..51ce93c6f 100644 --- a/doc/dialects/exasol.md +++ b/doc/dialects/exasol.md @@ -18,7 +18,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///virtualschema-jdbc-adapter-dist-3.0.0.jar; + %jar /buckets///virtualschema-jdbc-adapter-dist-3.0.1.jar; / ``` diff --git a/doc/dialects/hive.md b/doc/dialects/hive.md index 4c6ccbd08..6715e79ad 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/virtualschema-jdbc-adapter-dist-3.0.0.jar; + %jar /buckets///jars/virtualschema-jdbc-adapter-dist-3.0.1.jar; %jar /buckets///jars/HiveJDBC41.jar; / ``` diff --git a/doc/dialects/impala.md b/doc/dialects/impala.md index 4b044986c..e63211029 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///virtualschema-jdbc-adapter-dist-3.0.0.jar; + %jar /buckets///virtualschema-jdbc-adapter-dist-3.0.1.jar; %jar /buckets///ImpalaJDBC41.jar; / ; diff --git a/doc/dialects/mysql.md b/doc/dialects/mysql.md index d23b8e1f2..8113ee169 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 ADAPTER.JDBC_ADAPTER AS %scriptclass com.exasol.adapter.RequestDispatcher; - %jar /buckets///virtualschema-jdbc-adapter-dist-3.0.0.jar; + %jar /buckets///virtualschema-jdbc-adapter-dist-3.0.1.jar; %jar /buckets///mysql-connector-java-.jar; / ; diff --git a/doc/dialects/oracle.md b/doc/dialects/oracle.md index 74abf008c..5167d6fc3 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///virtualschema-jdbc-adapter-dist-3.0.0.jar; + %jar /buckets///virtualschema-jdbc-adapter-dist-3.0.1.jar; %jar /buckets///ojdbc.jar; / ; @@ -135,7 +135,7 @@ CREATE VIRTUAL SCHEMA ## Supported capabilities -The Oracle dialect does not support all capabilities. A complete list can be found in [OracleSqlDialect.getCapabilities()](../../jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/oracle/OracleSqlDialect.java). +The Oracle dialect does not support all capabilities. A complete list can be found in [OracleSqlDialect.getCapabilities()](../../src/main/java/com/exasol/adapter/dialects/oracle/OracleSqlDialect.java). ## Type Mappings and Limitations diff --git a/doc/dialects/postgresql.md b/doc/dialects/postgresql.md index 6cd7a5249..9bb2f9b25 100644 --- a/doc/dialects/postgresql.md +++ b/doc/dialects/postgresql.md @@ -24,7 +24,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///virtualschema-jdbc-adapter-dist-3.0.0.jar; + %jar /buckets///virtualschema-jdbc-adapter-dist-3.0.1.jar; %jar /buckets///postgresql-.jar; / ``` diff --git a/doc/dialects/redshift.md b/doc/dialects/redshift.md index 48392229f..ac468c2d0 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///virtualschema-jdbc-adapter-dist-3.0.0.jar; + %jar /buckets///virtualschema-jdbc-adapter-dist-3.0.1.jar; %jar /buckets///RedshiftJDBC42-.jar; / ; diff --git a/doc/dialects/saphana.md b/doc/dialects/saphana.md index 2159c4f1b..693a29c14 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///virtualschema-jdbc-adapter-dist-3.0.0.jar; + %jar /buckets///virtualschema-jdbc-adapter-dist-3.0.1.jar; %jar /buckets///ngdbc-.jar; / ; diff --git a/doc/dialects/sql_server.md b/doc/dialects/sql_server.md index fdbbbdc9c..e4c5cdcc0 100644 --- a/doc/dialects/sql_server.md +++ b/doc/dialects/sql_server.md @@ -24,7 +24,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///virtualschema-jdbc-adapter-dist-3.0.0.jar; + %jar /buckets///virtualschema-jdbc-adapter-dist-3.0.1.jar; %jar /buckets///jtds.jar; / ``` diff --git a/doc/dialects/sybase.md b/doc/dialects/sybase.md index 2414b17ae..f7b32f9c7 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///virtualschema-jdbc-adapter-dist-3.0.0.jar; + %jar /buckets///virtualschema-jdbc-adapter-dist-3.0.1.jar; %jar /buckets///jtds-.jar; / ``` diff --git a/doc/dialects/teradata.md b/doc/dialects/teradata.md index d3f62c2e5..060ba0c31 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///virtualschema-jdbc-adapter-dist-3.0.0.jar; + %jar /buckets///virtualschema-jdbc-adapter-dist-3.0.1.jar; %jar /buckets///terajdbc4.jar; %jar /buckets///tdgssconfig.jar; / diff --git a/doc/user-guide/deploying_the_virtual_schema_adapter.md b/doc/user-guide/deploying_the_virtual_schema_adapter.md index 0d1fe9c8e..d935eda91 100644 --- a/doc/user-guide/deploying_the_virtual_schema_adapter.md +++ b/doc/user-guide/deploying_the_virtual_schema_adapter.md @@ -23,7 +23,7 @@ cd virtual-schemas/jdbc-adapter/ mvn clean -DskipTests package ``` -The resulting fat JAR is stored in `virtualschema-jdbc-adapter-dist/target/virtualschema-jdbc-adapter-dist-3.0.0.jar`. +The resulting fat JAR is stored in `virtualschema-jdbc-adapter-dist/target/virtualschema-jdbc-adapter-dist-3.0.1.jar`. ## Uploading the Adapter JAR Archive @@ -46,8 +46,8 @@ Following steps are required to upload a file to a bucket: 1. Now upload the file into this bucket, e.g. using curl (adapt the hostname, BucketFS port, bucket name and bucket write password). ```bash -curl -X PUT -T virtualschema-jdbc-adapter-dist/target/virtualschema-jdbc-adapter-dist-3.0.0.jar \ - http://w:write-password@your.exasol.host.com:2580/bucket1/virtualschema-jdbc-adapter-dist-3.0.0.jar +curl -X PUT -T virtualschema-jdbc-adapter-dist/target/virtualschema-jdbc-adapter-dist-3.0.1.jar \ + http://w:write-password@your.exasol.host.com:2580/bucket1/virtualschema-jdbc-adapter-dist-3.0.1.jar ``` If you later need to change the bucket passwords, select the bucket and click "Edit". @@ -84,7 +84,7 @@ CREATE SCHEMA ADAPTER; CREATE JAVA ADAPTER SCRIPT ADAPTER.JDBC_ADAPTER AS %scriptclass com.exasol.adapter.RequestDispatcher; - %jar /buckets/your-bucket-fs/your-bucket/virtualschema-jdbc-adapter-dist-3.0.0.jar; + %jar /buckets/your-bucket-fs/your-bucket/virtualschema-jdbc-adapter-dist-3.0.1.jar; %jar /buckets/your-bucket-fs/your-bucket/.jar; / ``` diff --git a/jdbc-adapter/integration-test-data/db2-testdata.sql b/integration-test-data/db2-testdata.sql similarity index 100% rename from jdbc-adapter/integration-test-data/db2-testdata.sql rename to integration-test-data/db2-testdata.sql diff --git a/jdbc-adapter/integration-test-data/drivers/POSTGRESQL/postgresql-42.2.5.jar b/integration-test-data/drivers/POSTGRESQL/postgresql-42.2.5.jar similarity index 100% rename from jdbc-adapter/integration-test-data/drivers/POSTGRESQL/postgresql-42.2.5.jar rename to integration-test-data/drivers/POSTGRESQL/postgresql-42.2.5.jar diff --git a/jdbc-adapter/integration-test-data/drivers/POSTGRESQL/settings.cfg b/integration-test-data/drivers/POSTGRESQL/settings.cfg similarity index 100% rename from jdbc-adapter/integration-test-data/drivers/POSTGRESQL/settings.cfg rename to integration-test-data/drivers/POSTGRESQL/settings.cfg diff --git a/jdbc-adapter/integration-test-data/impala-testdata.sql b/integration-test-data/impala-testdata.sql similarity index 100% rename from jdbc-adapter/integration-test-data/impala-testdata.sql rename to integration-test-data/impala-testdata.sql diff --git a/jdbc-adapter/integration-test-data/integration-test-db2.yaml b/integration-test-data/integration-test-db2.yaml similarity index 96% rename from jdbc-adapter/integration-test-data/integration-test-db2.yaml rename to integration-test-data/integration-test-db2.yaml index fa2f9bb3b..75903a8a4 100644 --- a/jdbc-adapter/integration-test-data/integration-test-db2.yaml +++ b/integration-test-data/integration-test-db2.yaml @@ -5,7 +5,7 @@ general: debugAddress: '192.168.0.12:3000' # Address which will be defined as DEBUG_ADDRESS in the virtual schemas bucketFsUrl: http://exasol-host:2580/bucket1 bucketFsPassword: bucket1 - jdbcAdapterPath: /buckets/bucketfs1/bucket1/virtualschema-jdbc-adapter-dist-3.0.0.jar + jdbcAdapterPath: /buckets/bucketfs1/bucket1/virtualschema-jdbc-adapter-dist-3.0.1.jar exasol: runIntegrationTests: true diff --git a/jdbc-adapter/integration-test-data/integration-test-sample.yaml b/integration-test-data/integration-test-sample.yaml similarity index 99% rename from jdbc-adapter/integration-test-data/integration-test-sample.yaml rename to integration-test-data/integration-test-sample.yaml index f8e439c2f..54b92c584 100644 --- a/jdbc-adapter/integration-test-data/integration-test-sample.yaml +++ b/integration-test-data/integration-test-sample.yaml @@ -5,7 +5,7 @@ general: debugAddress: '192.168.0.12:3000' # Address which will be defined as DEBUG_ADDRESS in the virtual schemas bucketFsUrl: http://exasol-host:2580/bucket1 bucketFsPassword: bucket1 - jdbcAdapterPath: /buckets/bucketfs1/bucket1/virtualschema-jdbc-adapter-dist-3.0.0.jar + jdbcAdapterPath: /buckets/bucketfs1/bucket1/virtualschema-jdbc-adapter-dist-3.0.1.jar exasol: runIntegrationTests: true diff --git a/jdbc-adapter/integration-test-data/integration-test-travis.yaml b/integration-test-data/integration-test-travis.yaml similarity index 98% rename from jdbc-adapter/integration-test-data/integration-test-travis.yaml rename to integration-test-data/integration-test-travis.yaml index 7fde6d42b..70f931533 100644 --- a/jdbc-adapter/integration-test-data/integration-test-travis.yaml +++ b/integration-test-data/integration-test-travis.yaml @@ -4,7 +4,7 @@ general: debug: true debugAddress: '' bucketFsUrl: http://127.0.0.1:6594/default - jdbcAdapterPath: /buckets/bfsdefault/default/virtualschema-jdbc-adapter-dist-3.0.0.jar + jdbcAdapterPath: /buckets/bfsdefault/default/virtualschema-jdbc-adapter-dist-3.0.1.jar additionalJDBCDriverDir: /vagrant/drivers/ exasol: diff --git a/jdbc-adapter/integration-test-data/oracle-testdata.sql b/integration-test-data/oracle-testdata.sql similarity index 100% rename from jdbc-adapter/integration-test-data/oracle-testdata.sql rename to integration-test-data/oracle-testdata.sql diff --git a/jdbc-adapter/integration-test-data/postgres-testdata.sql b/integration-test-data/postgres-testdata.sql similarity index 100% rename from jdbc-adapter/integration-test-data/postgres-testdata.sql rename to integration-test-data/postgres-testdata.sql diff --git a/jdbc-adapter/integration-test-data/redshift-testdata.sql b/integration-test-data/redshift-testdata.sql similarity index 100% rename from jdbc-adapter/integration-test-data/redshift-testdata.sql rename to integration-test-data/redshift-testdata.sql diff --git a/jdbc-adapter/integration-test-data/run_integration_tests.sh b/integration-test-data/run_integration_tests.sh similarity index 98% rename from jdbc-adapter/integration-test-data/run_integration_tests.sh rename to integration-test-data/run_integration_tests.sh index 3d12fc2e7..dc8e93ccb 100755 --- a/jdbc-adapter/integration-test-data/run_integration_tests.sh +++ b/integration-test-data/run_integration_tests.sh @@ -65,7 +65,7 @@ deploy_jdbc_drivers() { fi #deploy adapter jar adapter_jar="$(awk '/jdbcAdapterPath/{ n=split($0,a,"/"); print a[n];}' $config)" - adapter_path="./virtualschema-jdbc-adapter-dist/target/$adapter_jar" + adapter_path="target/$adapter_jar" curl -X PUT -T "$adapter_path" "$bucket_fs_upload_url" } @@ -126,4 +126,4 @@ run_tests() { mvn -q verify -Pit -Dintegrationtest.configfile="$config_with_ips" -Dintegrationtest.skipTestSetup=true } -main "$@" \ No newline at end of file +main "$@" diff --git a/jdbc-adapter/integration-test-data/socker.py b/integration-test-data/socker.py similarity index 100% rename from jdbc-adapter/integration-test-data/socker.py rename to integration-test-data/socker.py diff --git a/jdbc-adapter/integration-test-data/sqlserver-testdata.sql b/integration-test-data/sqlserver-testdata.sql similarity index 100% rename from jdbc-adapter/integration-test-data/sqlserver-testdata.sql rename to integration-test-data/sqlserver-testdata.sql diff --git a/jdbc-adapter/integration-test-data/sybase.sql b/integration-test-data/sybase.sql similarity index 100% rename from jdbc-adapter/integration-test-data/sybase.sql rename to integration-test-data/sybase.sql diff --git a/jdbc-adapter/integration-test-data/sybase/sybase-create-tables.sql b/integration-test-data/sybase/sybase-create-tables.sql similarity index 100% rename from jdbc-adapter/integration-test-data/sybase/sybase-create-tables.sql rename to integration-test-data/sybase/sybase-create-tables.sql diff --git a/jdbc-adapter/integration-test-data/sybase/sybase-drop-tables.sql b/integration-test-data/sybase/sybase-drop-tables.sql similarity index 100% rename from jdbc-adapter/integration-test-data/sybase/sybase-drop-tables.sql rename to integration-test-data/sybase/sybase-drop-tables.sql diff --git a/jdbc-adapter/integration-test-data/sybase/sybase-populate-tables.sql b/integration-test-data/sybase/sybase-populate-tables.sql similarity index 100% rename from jdbc-adapter/integration-test-data/sybase/sybase-populate-tables.sql rename to integration-test-data/sybase/sybase-populate-tables.sql diff --git a/jdbc-adapter/integration-test-data/sybase/sybase-prepare-database.sql b/integration-test-data/sybase/sybase-prepare-database.sql similarity index 100% rename from jdbc-adapter/integration-test-data/sybase/sybase-prepare-database.sql rename to integration-test-data/sybase/sybase-prepare-database.sql diff --git a/jdbc-adapter/integration-test-data/teradata-testdata.sql b/integration-test-data/teradata-testdata.sql similarity index 100% rename from jdbc-adapter/integration-test-data/teradata-testdata.sql rename to integration-test-data/teradata-testdata.sql diff --git a/jdbc-adapter/.settings/org.eclipse.core.resources.prefs b/jdbc-adapter/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c020..000000000 --- a/jdbc-adapter/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/jdbc-adapter/local/integration-test-config.yaml b/jdbc-adapter/local/integration-test-config.yaml deleted file mode 100644 index f3dff0426..000000000 --- a/jdbc-adapter/local/integration-test-config.yaml +++ /dev/null @@ -1,89 +0,0 @@ -# Configuration file for integration tests - -general: - debug: false - debugAddress: '10.44.1.228:3000' # Address which will be defined as DEBUG_ADDRESS in the virtual schemas - bucketFsUrl: http://localhost:2580/jars - bucketFsPassword: public - jdbcAdapterPath: /buckets/bfsdefault/jars/virtualschema-jdbc-adapter-dist-3.0.0.jar - -exasol: - runIntegrationTests: true - address: localhost:8563 - user: sys - password: exasol - - - -# Generic sql dialect is tested via MySQL -generic: - runIntegrationTests: false - jdbcDriverPath: /buckets/bfsdefault/jars/mysql-connector-java-8.0.12.jar - connectionString: jdbc:mysql://localhost/virtual-schema-integration-test - user: virtual-schema-integration-test - password: password - -oracle: - runIntegrationTests: false - jdbcDriverPath: /buckets/mybucketfs/mybucket/oracle/ojdbc7.jar - connectionString: jdbc:oracle:thin:@oracle-host:1521:orcl - user: myuser - password: mypass - - -impala: - runIntegrationTests: false - connectionString: jdbc:impala://impala-host:21050;AuthMech=0 - jdbcDriverPath: /buckets/mybucketfs/mybucket/Cloudera_Impala_JDBC_2_5_28.1047_Driver/ - jdbcDriverJars: - - hive_metastore.jar - - hive_service.jar - - ImpalaJDBC41.jar - - libfb303-0.9.0.jar - - libthrift-0.9.0.jar - - log4j-1.2.14.jar - - ql.jar - - slf4j-api-1.5.11.jar - - slf4j-log4j12-1.5.11.jar - - TCLIServiceClient.jar - - zookeeper-3.4.6.jar - - -kerberos: - runIntegrationTests: false - jdbcDriverPath: /buckets/mybucketfs/mybucket/cloudera-hive-jdbc-driver/ - jdbcDriverJars: - - HiveJDBC41.jar - - hive_metastore.jar - - hive_service.jar - - libfb303-0.9.0.jar - - libthrift-0.9.0.jar - - log4j-1.2.14.jar - - ql.jar - - slf4j-api-1.5.11.jar - - slf4j-log4j12-1.5.11.jar - - TCLIServiceClient.jar - - zookeeper-3.4.6.jar - connectionString: jdbc:hive2://hadoop-host.yourcompany.com:10000/;AuthMech=1;KrbRealm=YOURCOMPANY.COM;KrbHostFQDN=hadoop-host.yourcompany.com;KrbServiceName=hive - user: testuser@YOURCOMPANY.COM - password: ExaAuthType=Kerberos;X3xpYmRlZmF1bHRzXQpkZWZhdWx0X3JlYWxtID0gT01HLkRFVi5FWEFTT0wuQ09NCmRuc19jYW5vbmljYWxpemVfaG9zdG5hbWUgPSBmYWxzZQpkbnNfbG9va3VwX2tkYyA9IGZhbHNlCmRuc19sb29rdXBfcmVhbG0gPSBmYWxzZQp0aWNrZXRfbGlmZXRpbWUgPSA4NjQwMApyZW5ld19saWZldGltZSA9IDYwNDgwMApmb3J3YXJkYWJsZSA9IHRydWUKZGVmYXVsdF90Z3NfZW5jdHlwZXMgPSBhcmNmb3VyLWhtYWMKZGVmYXVsdF90a3RfZW5jdHlwZXMgPSBhcmNmb3VyLWhtYWMKcGVybWl0dGVkX2VuY3R5cGVzID0gYXJjZm91ci1obWFjCnVkcF9wcmVmZXJlbmNlX2xpbWl0ID0gMQpbcmVhbG1zXQpPTUcuREVWLkVYQVNPTC5DT00gPSB7CmtkYyA9IGhhZG9vcDAxLm9tZy5kZXYuZXhhc29sLmNvbQphZG1pbl9zZXJ2ZXIgPSBoYWRvb3AwMS5vbWcuZGV2LmV4YXNvbC5jb20KfQo=;BQIAAABBAAEAEk9NRy5ERVYuRVhBU09MLkNPTQAMaGFkb29wdGVzdGVyAAAAAVYo0X0BABcAEGuPtGr6sYdhUEbTqhYQ3E0= - -hive: - runIntegrationTests: false - jdbcDriverPath: /buckets/mybucketfs/mybucket/cloudera-hive-jdbc-driver/ - jdbcDriverJars: - - HiveJDBC41.jar - - hive_metastore.jar - - hive_service.jar - - libfb303-0.9.0.jar - - libthrift-0.9.0.jar - - log4j-1.2.14.jar - - ql.jar - - slf4j-api-1.5.11.jar - - slf4j-log4j12-1.5.11.jar - - TCLIServiceClient.jar - - zookeeper-3.4.6.jar - connectionString: jdbc:hive2://hive-host:10000 - user: user - password: pass - diff --git a/jdbc-adapter/local/logging.properties b/jdbc-adapter/local/logging.properties deleted file mode 100644 index a7d5e9341..000000000 --- a/jdbc-adapter/local/logging.properties +++ /dev/null @@ -1,14 +0,0 @@ -handlers=java.util.logging.ConsoleHandler, java.util.logging.FileHandler -.level=INFO -java.util.logging.ConsoleHandler.level=ALL -java.util.logging.ConsoleHandler.formatter=java.util.logging.SimpleFormatter - -java.util.logging.FileHandler.level = ALL -java.util.logging.FileHandler.pattern=/home/seb/logs/virtual_schema.log -java.util.logging.FileHandler.limit=50000 -java.util.logging.FileHandler.count=1 -java.util.logging.FileHandler.formatter=java.util.logging.SimpleFormatter - -java.util.logging.SimpleFormatter.format=%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS.%1$tL %4$-7s [%3$s] %5$s %6$s%n - -com.exasol.level=ALL \ No newline at end of file diff --git a/jdbc-adapter/pom.xml b/jdbc-adapter/pom.xml deleted file mode 100644 index 29ba55b23..000000000 --- a/jdbc-adapter/pom.xml +++ /dev/null @@ -1,126 +0,0 @@ - - 4.0.0 - com.exasol - virtualschema-jdbc-adapter-main - ${product.version} - pom - - virtualschema-jdbc-adapter - virtualschema-jdbc-adapter-dist - - - 3.0.0 - UTF-8 - UTF-8 - 11 - 5.4.2 - 1.4.2 - 2.22.1 - 8.0.1 - 2.0.1 - - - - maven.exasol.com - https://maven.exasol.com/artifactory/exasol-releases - - - maven.exasol.com - https://maven.exasol.com/artifactory/exasol-snapshots - - - - - maven.exasol.com - https://maven.exasol.com/artifactory/exasol-releases - - false - - - - maven.exasol.com-snapshots - https://maven.exasol.com/artifactory/exasol-snapshots - - true - - - - - - com.exasol - virtual-schema-common-java - ${vscommon.version} - - - com.exasol - virtual-schema-common-jdbc - ${vsjdbc.version} - - - com.exasol - virtual-schema-common-jdbc - ${vsjdbc.version} - test-jar - test - - - org.hamcrest - hamcrest - 2.1 - test - - - org.skyscreamer - jsonassert - 1.5.0 - test - - - org.junit.jupiter - junit-jupiter-engine - ${junit.version} - test - - - org.junit.platform - junit-platform-runner - ${junit.platform.version} - test - - - org.junit.jupiter - junit-jupiter-params - ${junit.version} - test - - - org.itsallcode - junit5-system-extensions - 1.0.3 - test - - - org.mockito - mockito-core - 2.24.0 - - - org.mockito - mockito-junit-jupiter - 2.23.4 - test - - - javax.xml.bind - jaxb-api - 2.3.1 - - - org.glassfish - javax.el - 3.0.1-b11 - - - \ No newline at end of file diff --git a/jdbc-adapter/virtualschema-jdbc-adapter-dist/.settings/org.eclipse.core.resources.prefs b/jdbc-adapter/virtualschema-jdbc-adapter-dist/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index f9fe34593..000000000 --- a/jdbc-adapter/virtualschema-jdbc-adapter-dist/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,4 +0,0 @@ -eclipse.preferences.version=1 -encoding//src/main/java=UTF-8 -encoding//src/test/java=UTF-8 -encoding/=UTF-8 diff --git a/jdbc-adapter/virtualschema-jdbc-adapter-dist/.settings/org.eclipse.jdt.core.prefs b/jdbc-adapter/virtualschema-jdbc-adapter-dist/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 2bd4e7733..000000000 --- a/jdbc-adapter/virtualschema-jdbc-adapter-dist/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,16 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 -org.eclipse.jdt.core.compiler.debug.lineNumber=generate -org.eclipse.jdt.core.compiler.debug.localVariable=generate -org.eclipse.jdt.core.compiler.debug.sourceFile=generate -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning -org.eclipse.jdt.core.compiler.release=disabled -org.eclipse.jdt.core.compiler.source=11 diff --git a/jdbc-adapter/virtualschema-jdbc-adapter-dist/pom.xml b/jdbc-adapter/virtualschema-jdbc-adapter-dist/pom.xml deleted file mode 100644 index 2ee151012..000000000 --- a/jdbc-adapter/virtualschema-jdbc-adapter-dist/pom.xml +++ /dev/null @@ -1,64 +0,0 @@ - - 4.0.0 - - com.exasol - virtualschema-jdbc-adapter-main - ${product.version} - - virtualschema-jdbc-adapter-dist - - true - - - - com.exasol - virtualschema-jdbc-adapter - ${product.version} - - - - - - org.apache.maven.plugins - maven-assembly-plugin - 2.4.1 - - - src/main/assembly/all-dependencies.xml - - - - - job - - single - - - - - - org.apache.maven.plugins - maven-shade-plugin - 2.4.3 - - - package - - shade - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.2 - - ${java.version} - ${java.version} - - - - - \ No newline at end of file diff --git a/jdbc-adapter/virtualschema-jdbc-adapter-dist/src/main/assembly/all-dependencies.xml b/jdbc-adapter/virtualschema-jdbc-adapter-dist/src/main/assembly/all-dependencies.xml deleted file mode 100644 index 51b86372b..000000000 --- a/jdbc-adapter/virtualschema-jdbc-adapter-dist/src/main/assembly/all-dependencies.xml +++ /dev/null @@ -1,39 +0,0 @@ - - all-dependencies - - jar - - false - - - - metaInf-services - - - - - - true - runtime - / - - - - - - - - - diff --git a/jdbc-adapter/launch/virtual-schema all tests.launch b/launch/vs all tests.launch similarity index 72% rename from jdbc-adapter/launch/virtual-schema all tests.launch rename to launch/vs all tests.launch index 294909c96..a0708b8e6 100644 --- a/jdbc-adapter/launch/virtual-schema all tests.launch +++ b/launch/vs all tests.launch @@ -1,20 +1,12 @@ - + - - - - - - - - - + @@ -22,7 +14,7 @@ - + diff --git a/jdbc-adapter/launch/virtual-schema clean package.launch b/launch/vs clean package.launch similarity index 95% rename from jdbc-adapter/launch/virtual-schema clean package.launch rename to launch/vs clean package.launch index fccea17be..d63aee9e2 100644 --- a/jdbc-adapter/launch/virtual-schema clean package.launch +++ b/launch/vs clean package.launch @@ -16,5 +16,5 @@ - + diff --git a/jdbc-adapter/launch/virtual-schema clean.launch b/launch/vs clean.launch similarity index 95% rename from jdbc-adapter/launch/virtual-schema clean.launch rename to launch/vs clean.launch index f2226cc22..d18e0fd54 100644 --- a/jdbc-adapter/launch/virtual-schema clean.launch +++ b/launch/vs clean.launch @@ -16,5 +16,5 @@ - + diff --git a/jdbc-adapter/launch/virtual-schema debug listen on port 8000.launch b/launch/vs debug listen on port 8000.launch similarity index 90% rename from jdbc-adapter/launch/virtual-schema debug listen on port 8000.launch rename to launch/vs debug listen on port 8000.launch index a3878f346..9648af348 100644 --- a/jdbc-adapter/launch/virtual-schema debug listen on port 8000.launch +++ b/launch/vs debug listen on port 8000.launch @@ -1,19 +1,21 @@ - + + + + - - + diff --git a/jdbc-adapter/launch/virtual-schemas version.sh unify.launch b/launch/vs unify versions.launch similarity index 88% rename from jdbc-adapter/launch/virtual-schemas version.sh unify.launch rename to launch/vs unify versions.launch index 564b79326..822a0826c 100644 --- a/jdbc-adapter/launch/virtual-schemas version.sh unify.launch +++ b/launch/vs unify versions.launch @@ -3,7 +3,7 @@ - + diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/pom.xml b/pom.xml similarity index 53% rename from jdbc-adapter/virtualschema-jdbc-adapter/pom.xml rename to pom.xml index ddade6154..851d40b2e 100644 --- a/jdbc-adapter/virtualschema-jdbc-adapter/pom.xml +++ b/pom.xml @@ -1,14 +1,21 @@ - + 4.0.0 - - com.exasol - virtualschema-jdbc-adapter-main - ${product.version} - - virtualschema-jdbc-adapter + com.exasol + virtual-schema-jdbc-adapter + ${product.version} + Virtual Schema JDBC Adapter - 2.22.1 + 3.0.1 + UTF-8 + UTF-8 + 11 + 5.5.2 + 1.5.2 + 2.22.1 + 8.0.1 + 2.0.1 @@ -38,8 +45,6 @@ - - false @@ -47,7 +52,7 @@ org.apache.maven.plugins maven-failsafe-plugin - ${surefire.and.failsafe.plugin.version} + ${maven.surefire.and.failsafe.plugin.version} @@ -68,7 +73,7 @@ verify - verify @@ -91,14 +96,14 @@ - test + test java -classpath - - + com.exasol.adapter.dialects.IntegrationTestSetup ${project.version} ${integrationtest.configfile} @@ -112,9 +117,109 @@ + + + maven.exasol.com + https://maven.exasol.com/artifactory/exasol-releases + + + maven.exasol.com + https://maven.exasol.com/artifactory/exasol-snapshots + + + + + maven.exasol.com + https://maven.exasol.com/artifactory/exasol-releases + + false + + + + maven.exasol.com-snapshots + https://maven.exasol.com/artifactory/exasol-snapshots + + true + + + - + + com.exasol + virtual-schema-common-java + ${vscjava.version} + + + com.exasol + virtual-schema-common-jdbc + ${vscjdbc.version} + + + com.exasol + virtual-schema-common-jdbc + ${vscjdbc.version} + test-jar + test + + + org.hamcrest + hamcrest + 2.2 + test + + + org.skyscreamer + jsonassert + 1.5.0 + test + + + org.junit.jupiter + junit-jupiter-engine + ${junit.version} + test + + + org.junit.platform + junit-platform-runner + ${junit.platform.version} + test + + + org.junit.jupiter + junit-jupiter-params + ${junit.version} + test + + + org.itsallcode + junit5-system-extensions + 1.0.3 + test + + + org.mockito + mockito-core + 3.2.4 + + + org.mockito + mockito-junit-jupiter + 3.2.4 + test + + + javax.xml.bind + jaxb-api + 2.3.1 + + + org.glassfish + javax.el + 3.0.1-b11 + + org.yaml snakeyaml @@ -140,12 +245,12 @@ 4.5.2 integration-test - + com.exasol exasol-jdbc - 6.0-SNAPSHOT + 6.2.1 org.apache.derby @@ -159,18 +264,18 @@ org.apache.maven.plugins maven-surefire-plugin - ${surefire.and.failsafe.plugin.version} + ${maven.surefire.and.failsafe.plugin.version} - - -Djava.util.logging.config.file=src/test/resources/logging.properties ${argLine} + + -Djava.util.logging.config.file=src/test/resources/logging.properties ${argLine} org.jacoco jacoco-maven-plugin - 0.8.3 + 0.8.5 @@ -189,12 +294,32 @@ org.apache.maven.plugins maven-compiler-plugin - 3.8.0 + 3.8.1 ${java.version} ${java.version} + + maven-assembly-plugin + 3.2.0 + + + assembly/all-dependencies.xml + + virtualschema-jdbc-adapter-dist-${product.version} + false + + + + make-assembly + package + + single + + + + \ No newline at end of file diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/AbstractSqlDialectFactory.java b/src/main/java/com/exasol/adapter/dialects/AbstractSqlDialectFactory.java similarity index 82% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/AbstractSqlDialectFactory.java rename to src/main/java/com/exasol/adapter/dialects/AbstractSqlDialectFactory.java index d46007380..c759dd923 100644 --- a/jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/AbstractSqlDialectFactory.java +++ b/src/main/java/com/exasol/adapter/dialects/AbstractSqlDialectFactory.java @@ -9,7 +9,7 @@ public abstract class AbstractSqlDialectFactory implements SqlDialectFactory { @Override public String getSqlDialectVersion() { final VersionCollector versionCollector = new VersionCollector( - "META-INF/maven/com.exasol/virtualschema-jdbc-adapter/pom.properties"); + "META-INF/maven/com.exasol/virtual-schema-jdbc-adapter/pom.properties"); return versionCollector.getVersionNumber(); } } diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/athena/AthenaMetadataReader.java b/src/main/java/com/exasol/adapter/dialects/athena/AthenaMetadataReader.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/athena/AthenaMetadataReader.java rename to src/main/java/com/exasol/adapter/dialects/athena/AthenaMetadataReader.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/athena/AthenaSqlDialect.java b/src/main/java/com/exasol/adapter/dialects/athena/AthenaSqlDialect.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/athena/AthenaSqlDialect.java rename to src/main/java/com/exasol/adapter/dialects/athena/AthenaSqlDialect.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/athena/AthenaSqlDialectFactory.java b/src/main/java/com/exasol/adapter/dialects/athena/AthenaSqlDialectFactory.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/athena/AthenaSqlDialectFactory.java rename to src/main/java/com/exasol/adapter/dialects/athena/AthenaSqlDialectFactory.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/bigquery/BigQueryMetadataReader.java b/src/main/java/com/exasol/adapter/dialects/bigquery/BigQueryMetadataReader.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/bigquery/BigQueryMetadataReader.java rename to src/main/java/com/exasol/adapter/dialects/bigquery/BigQueryMetadataReader.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/bigquery/BigQueryQueryRewriter.java b/src/main/java/com/exasol/adapter/dialects/bigquery/BigQueryQueryRewriter.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/bigquery/BigQueryQueryRewriter.java rename to src/main/java/com/exasol/adapter/dialects/bigquery/BigQueryQueryRewriter.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/bigquery/BigQuerySqlDialect.java b/src/main/java/com/exasol/adapter/dialects/bigquery/BigQuerySqlDialect.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/bigquery/BigQuerySqlDialect.java rename to src/main/java/com/exasol/adapter/dialects/bigquery/BigQuerySqlDialect.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/bigquery/BigQuerySqlDialectFactory.java b/src/main/java/com/exasol/adapter/dialects/bigquery/BigQuerySqlDialectFactory.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/bigquery/BigQuerySqlDialectFactory.java rename to src/main/java/com/exasol/adapter/dialects/bigquery/BigQuerySqlDialectFactory.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/bigquery/BigQuerySqlGenerationVisitor.java b/src/main/java/com/exasol/adapter/dialects/bigquery/BigQuerySqlGenerationVisitor.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/bigquery/BigQuerySqlGenerationVisitor.java rename to src/main/java/com/exasol/adapter/dialects/bigquery/BigQuerySqlGenerationVisitor.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/db2/DB2ColumnMetadataReader.java b/src/main/java/com/exasol/adapter/dialects/db2/DB2ColumnMetadataReader.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/db2/DB2ColumnMetadataReader.java rename to src/main/java/com/exasol/adapter/dialects/db2/DB2ColumnMetadataReader.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/db2/DB2MetadataReader.java b/src/main/java/com/exasol/adapter/dialects/db2/DB2MetadataReader.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/db2/DB2MetadataReader.java rename to src/main/java/com/exasol/adapter/dialects/db2/DB2MetadataReader.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/db2/DB2SqlDialect.java b/src/main/java/com/exasol/adapter/dialects/db2/DB2SqlDialect.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/db2/DB2SqlDialect.java rename to src/main/java/com/exasol/adapter/dialects/db2/DB2SqlDialect.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/db2/DB2SqlDialectFactory.java b/src/main/java/com/exasol/adapter/dialects/db2/DB2SqlDialectFactory.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/db2/DB2SqlDialectFactory.java rename to src/main/java/com/exasol/adapter/dialects/db2/DB2SqlDialectFactory.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/db2/DB2SqlGenerationVisitor.java b/src/main/java/com/exasol/adapter/dialects/db2/DB2SqlGenerationVisitor.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/db2/DB2SqlGenerationVisitor.java rename to src/main/java/com/exasol/adapter/dialects/db2/DB2SqlGenerationVisitor.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/exasol/ExasolColumnMetadataReader.java b/src/main/java/com/exasol/adapter/dialects/exasol/ExasolColumnMetadataReader.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/exasol/ExasolColumnMetadataReader.java rename to src/main/java/com/exasol/adapter/dialects/exasol/ExasolColumnMetadataReader.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/exasol/ExasolConnectionDefinitionBuilder.java b/src/main/java/com/exasol/adapter/dialects/exasol/ExasolConnectionDefinitionBuilder.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/exasol/ExasolConnectionDefinitionBuilder.java rename to src/main/java/com/exasol/adapter/dialects/exasol/ExasolConnectionDefinitionBuilder.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/exasol/ExasolMetadataReader.java b/src/main/java/com/exasol/adapter/dialects/exasol/ExasolMetadataReader.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/exasol/ExasolMetadataReader.java rename to src/main/java/com/exasol/adapter/dialects/exasol/ExasolMetadataReader.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/exasol/ExasolProperties.java b/src/main/java/com/exasol/adapter/dialects/exasol/ExasolProperties.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/exasol/ExasolProperties.java rename to src/main/java/com/exasol/adapter/dialects/exasol/ExasolProperties.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/exasol/ExasolQueryRewriter.java b/src/main/java/com/exasol/adapter/dialects/exasol/ExasolQueryRewriter.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/exasol/ExasolQueryRewriter.java rename to src/main/java/com/exasol/adapter/dialects/exasol/ExasolQueryRewriter.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/exasol/ExasolSqlDialect.java b/src/main/java/com/exasol/adapter/dialects/exasol/ExasolSqlDialect.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/exasol/ExasolSqlDialect.java rename to src/main/java/com/exasol/adapter/dialects/exasol/ExasolSqlDialect.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/exasol/ExasolSqlDialectFactory.java b/src/main/java/com/exasol/adapter/dialects/exasol/ExasolSqlDialectFactory.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/exasol/ExasolSqlDialectFactory.java rename to src/main/java/com/exasol/adapter/dialects/exasol/ExasolSqlDialectFactory.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/generic/GenericIdentifierConverter.java b/src/main/java/com/exasol/adapter/dialects/generic/GenericIdentifierConverter.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/generic/GenericIdentifierConverter.java rename to src/main/java/com/exasol/adapter/dialects/generic/GenericIdentifierConverter.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/generic/GenericMetadataReader.java b/src/main/java/com/exasol/adapter/dialects/generic/GenericMetadataReader.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/generic/GenericMetadataReader.java rename to src/main/java/com/exasol/adapter/dialects/generic/GenericMetadataReader.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/generic/GenericSqlDialect.java b/src/main/java/com/exasol/adapter/dialects/generic/GenericSqlDialect.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/generic/GenericSqlDialect.java rename to src/main/java/com/exasol/adapter/dialects/generic/GenericSqlDialect.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/generic/GenericSqlDialectFactory.java b/src/main/java/com/exasol/adapter/dialects/generic/GenericSqlDialectFactory.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/generic/GenericSqlDialectFactory.java rename to src/main/java/com/exasol/adapter/dialects/generic/GenericSqlDialectFactory.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/hive/HiveColumnMetadataReader.java b/src/main/java/com/exasol/adapter/dialects/hive/HiveColumnMetadataReader.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/hive/HiveColumnMetadataReader.java rename to src/main/java/com/exasol/adapter/dialects/hive/HiveColumnMetadataReader.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/hive/HiveMetadataReader.java b/src/main/java/com/exasol/adapter/dialects/hive/HiveMetadataReader.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/hive/HiveMetadataReader.java rename to src/main/java/com/exasol/adapter/dialects/hive/HiveMetadataReader.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/hive/HiveProperties.java b/src/main/java/com/exasol/adapter/dialects/hive/HiveProperties.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/hive/HiveProperties.java rename to src/main/java/com/exasol/adapter/dialects/hive/HiveProperties.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/hive/HiveSqlDialect.java b/src/main/java/com/exasol/adapter/dialects/hive/HiveSqlDialect.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/hive/HiveSqlDialect.java rename to src/main/java/com/exasol/adapter/dialects/hive/HiveSqlDialect.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/hive/HiveSqlDialectFactory.java b/src/main/java/com/exasol/adapter/dialects/hive/HiveSqlDialectFactory.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/hive/HiveSqlDialectFactory.java rename to src/main/java/com/exasol/adapter/dialects/hive/HiveSqlDialectFactory.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/hive/HiveSqlGenerationVisitor.java b/src/main/java/com/exasol/adapter/dialects/hive/HiveSqlGenerationVisitor.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/hive/HiveSqlGenerationVisitor.java rename to src/main/java/com/exasol/adapter/dialects/hive/HiveSqlGenerationVisitor.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/impala/ImpalaMetadataReader.java b/src/main/java/com/exasol/adapter/dialects/impala/ImpalaMetadataReader.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/impala/ImpalaMetadataReader.java rename to src/main/java/com/exasol/adapter/dialects/impala/ImpalaMetadataReader.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/impala/ImpalaSqlDialect.java b/src/main/java/com/exasol/adapter/dialects/impala/ImpalaSqlDialect.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/impala/ImpalaSqlDialect.java rename to src/main/java/com/exasol/adapter/dialects/impala/ImpalaSqlDialect.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/impala/ImpalaSqlDialectFactory.java b/src/main/java/com/exasol/adapter/dialects/impala/ImpalaSqlDialectFactory.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/impala/ImpalaSqlDialectFactory.java rename to src/main/java/com/exasol/adapter/dialects/impala/ImpalaSqlDialectFactory.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/impala/ImpalaSqlGenerationVisitor.java b/src/main/java/com/exasol/adapter/dialects/impala/ImpalaSqlGenerationVisitor.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/impala/ImpalaSqlGenerationVisitor.java rename to src/main/java/com/exasol/adapter/dialects/impala/ImpalaSqlGenerationVisitor.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/mysql/MySqlColumnMetadataReader.java b/src/main/java/com/exasol/adapter/dialects/mysql/MySqlColumnMetadataReader.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/mysql/MySqlColumnMetadataReader.java rename to src/main/java/com/exasol/adapter/dialects/mysql/MySqlColumnMetadataReader.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/mysql/MySqlMetadataReader.java b/src/main/java/com/exasol/adapter/dialects/mysql/MySqlMetadataReader.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/mysql/MySqlMetadataReader.java rename to src/main/java/com/exasol/adapter/dialects/mysql/MySqlMetadataReader.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/mysql/MySqlSqlDialect.java b/src/main/java/com/exasol/adapter/dialects/mysql/MySqlSqlDialect.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/mysql/MySqlSqlDialect.java rename to src/main/java/com/exasol/adapter/dialects/mysql/MySqlSqlDialect.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/mysql/MySqlSqlDialectFactory.java b/src/main/java/com/exasol/adapter/dialects/mysql/MySqlSqlDialectFactory.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/mysql/MySqlSqlDialectFactory.java rename to src/main/java/com/exasol/adapter/dialects/mysql/MySqlSqlDialectFactory.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/oracle/OracleColumnMetadataReader.java b/src/main/java/com/exasol/adapter/dialects/oracle/OracleColumnMetadataReader.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/oracle/OracleColumnMetadataReader.java rename to src/main/java/com/exasol/adapter/dialects/oracle/OracleColumnMetadataReader.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/oracle/OracleConnectionDefinitionBuilder.java b/src/main/java/com/exasol/adapter/dialects/oracle/OracleConnectionDefinitionBuilder.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/oracle/OracleConnectionDefinitionBuilder.java rename to src/main/java/com/exasol/adapter/dialects/oracle/OracleConnectionDefinitionBuilder.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/oracle/OracleMetadataReader.java b/src/main/java/com/exasol/adapter/dialects/oracle/OracleMetadataReader.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/oracle/OracleMetadataReader.java rename to src/main/java/com/exasol/adapter/dialects/oracle/OracleMetadataReader.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/oracle/OracleProperties.java b/src/main/java/com/exasol/adapter/dialects/oracle/OracleProperties.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/oracle/OracleProperties.java rename to src/main/java/com/exasol/adapter/dialects/oracle/OracleProperties.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/oracle/OracleQueryRewriter.java b/src/main/java/com/exasol/adapter/dialects/oracle/OracleQueryRewriter.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/oracle/OracleQueryRewriter.java rename to src/main/java/com/exasol/adapter/dialects/oracle/OracleQueryRewriter.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/oracle/OracleSqlDialect.java b/src/main/java/com/exasol/adapter/dialects/oracle/OracleSqlDialect.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/oracle/OracleSqlDialect.java rename to src/main/java/com/exasol/adapter/dialects/oracle/OracleSqlDialect.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/oracle/OracleSqlDialectFactory.java b/src/main/java/com/exasol/adapter/dialects/oracle/OracleSqlDialectFactory.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/oracle/OracleSqlDialectFactory.java rename to src/main/java/com/exasol/adapter/dialects/oracle/OracleSqlDialectFactory.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/oracle/OracleSqlGenerationVisitor.java b/src/main/java/com/exasol/adapter/dialects/oracle/OracleSqlGenerationVisitor.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/oracle/OracleSqlGenerationVisitor.java rename to src/main/java/com/exasol/adapter/dialects/oracle/OracleSqlGenerationVisitor.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/oracle/OracleTableMetadataReader.java b/src/main/java/com/exasol/adapter/dialects/oracle/OracleTableMetadataReader.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/oracle/OracleTableMetadataReader.java rename to src/main/java/com/exasol/adapter/dialects/oracle/OracleTableMetadataReader.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/postgresql/PostgreSQLColumnMetadataReader.java b/src/main/java/com/exasol/adapter/dialects/postgresql/PostgreSQLColumnMetadataReader.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/postgresql/PostgreSQLColumnMetadataReader.java rename to src/main/java/com/exasol/adapter/dialects/postgresql/PostgreSQLColumnMetadataReader.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/postgresql/PostgreSQLIdentifierConverter.java b/src/main/java/com/exasol/adapter/dialects/postgresql/PostgreSQLIdentifierConverter.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/postgresql/PostgreSQLIdentifierConverter.java rename to src/main/java/com/exasol/adapter/dialects/postgresql/PostgreSQLIdentifierConverter.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/postgresql/PostgreSQLIdentifierMapping.java b/src/main/java/com/exasol/adapter/dialects/postgresql/PostgreSQLIdentifierMapping.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/postgresql/PostgreSQLIdentifierMapping.java rename to src/main/java/com/exasol/adapter/dialects/postgresql/PostgreSQLIdentifierMapping.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/postgresql/PostgreSQLMetadataReader.java b/src/main/java/com/exasol/adapter/dialects/postgresql/PostgreSQLMetadataReader.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/postgresql/PostgreSQLMetadataReader.java rename to src/main/java/com/exasol/adapter/dialects/postgresql/PostgreSQLMetadataReader.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/postgresql/PostgreSQLSqlDialect.java b/src/main/java/com/exasol/adapter/dialects/postgresql/PostgreSQLSqlDialect.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/postgresql/PostgreSQLSqlDialect.java rename to src/main/java/com/exasol/adapter/dialects/postgresql/PostgreSQLSqlDialect.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/postgresql/PostgreSQLSqlDialectFactory.java b/src/main/java/com/exasol/adapter/dialects/postgresql/PostgreSQLSqlDialectFactory.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/postgresql/PostgreSQLSqlDialectFactory.java rename to src/main/java/com/exasol/adapter/dialects/postgresql/PostgreSQLSqlDialectFactory.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/postgresql/PostgreSQLTableMetadataReader.java b/src/main/java/com/exasol/adapter/dialects/postgresql/PostgreSQLTableMetadataReader.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/postgresql/PostgreSQLTableMetadataReader.java rename to src/main/java/com/exasol/adapter/dialects/postgresql/PostgreSQLTableMetadataReader.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/postgresql/PostgresSQLSqlGenerationVisitor.java b/src/main/java/com/exasol/adapter/dialects/postgresql/PostgresSQLSqlGenerationVisitor.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/postgresql/PostgresSQLSqlGenerationVisitor.java rename to src/main/java/com/exasol/adapter/dialects/postgresql/PostgresSQLSqlGenerationVisitor.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/redshift/RedshiftColumnMetadataReader.java b/src/main/java/com/exasol/adapter/dialects/redshift/RedshiftColumnMetadataReader.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/redshift/RedshiftColumnMetadataReader.java rename to src/main/java/com/exasol/adapter/dialects/redshift/RedshiftColumnMetadataReader.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/redshift/RedshiftMetadataReader.java b/src/main/java/com/exasol/adapter/dialects/redshift/RedshiftMetadataReader.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/redshift/RedshiftMetadataReader.java rename to src/main/java/com/exasol/adapter/dialects/redshift/RedshiftMetadataReader.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/redshift/RedshiftSqlDialect.java b/src/main/java/com/exasol/adapter/dialects/redshift/RedshiftSqlDialect.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/redshift/RedshiftSqlDialect.java rename to src/main/java/com/exasol/adapter/dialects/redshift/RedshiftSqlDialect.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/redshift/RedshiftSqlDialectFactory.java b/src/main/java/com/exasol/adapter/dialects/redshift/RedshiftSqlDialectFactory.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/redshift/RedshiftSqlDialectFactory.java rename to src/main/java/com/exasol/adapter/dialects/redshift/RedshiftSqlDialectFactory.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/redshift/RedshiftSqlGenerationVisitor.java b/src/main/java/com/exasol/adapter/dialects/redshift/RedshiftSqlGenerationVisitor.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/redshift/RedshiftSqlGenerationVisitor.java rename to src/main/java/com/exasol/adapter/dialects/redshift/RedshiftSqlGenerationVisitor.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/redshift/RedshiftTableMetadataReader.java b/src/main/java/com/exasol/adapter/dialects/redshift/RedshiftTableMetadataReader.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/redshift/RedshiftTableMetadataReader.java rename to src/main/java/com/exasol/adapter/dialects/redshift/RedshiftTableMetadataReader.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/saphana/SapHanaMetadataReader.java b/src/main/java/com/exasol/adapter/dialects/saphana/SapHanaMetadataReader.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/saphana/SapHanaMetadataReader.java rename to src/main/java/com/exasol/adapter/dialects/saphana/SapHanaMetadataReader.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/saphana/SapHanaSqlDialect.java b/src/main/java/com/exasol/adapter/dialects/saphana/SapHanaSqlDialect.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/saphana/SapHanaSqlDialect.java rename to src/main/java/com/exasol/adapter/dialects/saphana/SapHanaSqlDialect.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/saphana/SapHanaSqlDialectFactory.java b/src/main/java/com/exasol/adapter/dialects/saphana/SapHanaSqlDialectFactory.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/saphana/SapHanaSqlDialectFactory.java rename to src/main/java/com/exasol/adapter/dialects/saphana/SapHanaSqlDialectFactory.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/sqlserver/SqlServerColumnMetadataReader.java b/src/main/java/com/exasol/adapter/dialects/sqlserver/SqlServerColumnMetadataReader.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/sqlserver/SqlServerColumnMetadataReader.java rename to src/main/java/com/exasol/adapter/dialects/sqlserver/SqlServerColumnMetadataReader.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/sqlserver/SqlServerMetadataReader.java b/src/main/java/com/exasol/adapter/dialects/sqlserver/SqlServerMetadataReader.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/sqlserver/SqlServerMetadataReader.java rename to src/main/java/com/exasol/adapter/dialects/sqlserver/SqlServerMetadataReader.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/sqlserver/SqlServerSqlDialect.java b/src/main/java/com/exasol/adapter/dialects/sqlserver/SqlServerSqlDialect.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/sqlserver/SqlServerSqlDialect.java rename to src/main/java/com/exasol/adapter/dialects/sqlserver/SqlServerSqlDialect.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/sqlserver/SqlServerSqlDialectFactory.java b/src/main/java/com/exasol/adapter/dialects/sqlserver/SqlServerSqlDialectFactory.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/sqlserver/SqlServerSqlDialectFactory.java rename to src/main/java/com/exasol/adapter/dialects/sqlserver/SqlServerSqlDialectFactory.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/sqlserver/SqlServerSqlGenerationVisitor.java b/src/main/java/com/exasol/adapter/dialects/sqlserver/SqlServerSqlGenerationVisitor.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/sqlserver/SqlServerSqlGenerationVisitor.java rename to src/main/java/com/exasol/adapter/dialects/sqlserver/SqlServerSqlGenerationVisitor.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/sybase/SybaseMetadataReader.java b/src/main/java/com/exasol/adapter/dialects/sybase/SybaseMetadataReader.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/sybase/SybaseMetadataReader.java rename to src/main/java/com/exasol/adapter/dialects/sybase/SybaseMetadataReader.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/sybase/SybaseSqlDialect.java b/src/main/java/com/exasol/adapter/dialects/sybase/SybaseSqlDialect.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/sybase/SybaseSqlDialect.java rename to src/main/java/com/exasol/adapter/dialects/sybase/SybaseSqlDialect.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/sybase/SybaseSqlDialectFactory.java b/src/main/java/com/exasol/adapter/dialects/sybase/SybaseSqlDialectFactory.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/sybase/SybaseSqlDialectFactory.java rename to src/main/java/com/exasol/adapter/dialects/sybase/SybaseSqlDialectFactory.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/sybase/SybaseSqlGenerationVisitor.java b/src/main/java/com/exasol/adapter/dialects/sybase/SybaseSqlGenerationVisitor.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/sybase/SybaseSqlGenerationVisitor.java rename to src/main/java/com/exasol/adapter/dialects/sybase/SybaseSqlGenerationVisitor.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/teradata/TeradataColumnMetadataReader.java b/src/main/java/com/exasol/adapter/dialects/teradata/TeradataColumnMetadataReader.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/teradata/TeradataColumnMetadataReader.java rename to src/main/java/com/exasol/adapter/dialects/teradata/TeradataColumnMetadataReader.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/teradata/TeradataMetadataReader.java b/src/main/java/com/exasol/adapter/dialects/teradata/TeradataMetadataReader.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/teradata/TeradataMetadataReader.java rename to src/main/java/com/exasol/adapter/dialects/teradata/TeradataMetadataReader.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/teradata/TeradataSqlDialect.java b/src/main/java/com/exasol/adapter/dialects/teradata/TeradataSqlDialect.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/teradata/TeradataSqlDialect.java rename to src/main/java/com/exasol/adapter/dialects/teradata/TeradataSqlDialect.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/teradata/TeradataSqlDialectFactory.java b/src/main/java/com/exasol/adapter/dialects/teradata/TeradataSqlDialectFactory.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/teradata/TeradataSqlDialectFactory.java rename to src/main/java/com/exasol/adapter/dialects/teradata/TeradataSqlDialectFactory.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/teradata/TeradataSqlGenerationVisitor.java b/src/main/java/com/exasol/adapter/dialects/teradata/TeradataSqlGenerationVisitor.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/teradata/TeradataSqlGenerationVisitor.java rename to src/main/java/com/exasol/adapter/dialects/teradata/TeradataSqlGenerationVisitor.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/main/resources/META-INF/services/com.exasol.adapter.AdapterFactory b/src/main/resources/META-INF/services/com.exasol.adapter.AdapterFactory similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/main/resources/META-INF/services/com.exasol.adapter.AdapterFactory rename to src/main/resources/META-INF/services/com.exasol.adapter.AdapterFactory diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/main/resources/META-INF/services/com.exasol.adapter.dialects.SqlDialectFactory b/src/main/resources/META-INF/services/com.exasol.adapter.dialects.SqlDialectFactory similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/main/resources/META-INF/services/com.exasol.adapter.dialects.SqlDialectFactory rename to src/main/resources/META-INF/services/com.exasol.adapter.dialects.SqlDialectFactory diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/AbstractIntegrationTest.java b/src/test/java/com/exasol/adapter/dialects/AbstractIntegrationTest.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/AbstractIntegrationTest.java rename to src/test/java/com/exasol/adapter/dialects/AbstractIntegrationTest.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/AbstractSqlDialectFactoryTest.java b/src/test/java/com/exasol/adapter/dialects/AbstractSqlDialectFactoryTest.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/AbstractSqlDialectFactoryTest.java rename to src/test/java/com/exasol/adapter/dialects/AbstractSqlDialectFactoryTest.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/DialectTestData.java b/src/test/java/com/exasol/adapter/dialects/DialectTestData.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/DialectTestData.java rename to src/test/java/com/exasol/adapter/dialects/DialectTestData.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/FileBasedIntegrationTest.java b/src/test/java/com/exasol/adapter/dialects/FileBasedIntegrationTest.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/FileBasedIntegrationTest.java rename to src/test/java/com/exasol/adapter/dialects/FileBasedIntegrationTest.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/IntegrationTestConfig.java b/src/test/java/com/exasol/adapter/dialects/IntegrationTestConfig.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/IntegrationTestConfig.java rename to src/test/java/com/exasol/adapter/dialects/IntegrationTestConfig.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/IntegrationTestConfigurationCondition.java b/src/test/java/com/exasol/adapter/dialects/IntegrationTestConfigurationCondition.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/IntegrationTestConfigurationCondition.java rename to src/test/java/com/exasol/adapter/dialects/IntegrationTestConfigurationCondition.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/IntegrationTestConstants.java b/src/test/java/com/exasol/adapter/dialects/IntegrationTestConstants.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/IntegrationTestConstants.java rename to src/test/java/com/exasol/adapter/dialects/IntegrationTestConstants.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/IntegrationTestPreconditions.java b/src/test/java/com/exasol/adapter/dialects/IntegrationTestPreconditions.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/IntegrationTestPreconditions.java rename to src/test/java/com/exasol/adapter/dialects/IntegrationTestPreconditions.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/IntegrationTestSetup.java b/src/test/java/com/exasol/adapter/dialects/IntegrationTestSetup.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/IntegrationTestSetup.java rename to src/test/java/com/exasol/adapter/dialects/IntegrationTestSetup.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/IntegrationTestSetupException.java b/src/test/java/com/exasol/adapter/dialects/IntegrationTestSetupException.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/IntegrationTestSetupException.java rename to src/test/java/com/exasol/adapter/dialects/IntegrationTestSetupException.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/KerberosIT.java b/src/test/java/com/exasol/adapter/dialects/KerberosIT.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/KerberosIT.java rename to src/test/java/com/exasol/adapter/dialects/KerberosIT.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/SqlGenerationHelperTest.java b/src/test/java/com/exasol/adapter/dialects/SqlGenerationHelperTest.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/SqlGenerationHelperTest.java rename to src/test/java/com/exasol/adapter/dialects/SqlGenerationHelperTest.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/VisitorAssertions.java b/src/test/java/com/exasol/adapter/dialects/VisitorAssertions.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/VisitorAssertions.java rename to src/test/java/com/exasol/adapter/dialects/VisitorAssertions.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/athena/AthenaMetadataReaderTest.java b/src/test/java/com/exasol/adapter/dialects/athena/AthenaMetadataReaderTest.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/athena/AthenaMetadataReaderTest.java rename to src/test/java/com/exasol/adapter/dialects/athena/AthenaMetadataReaderTest.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/athena/AthenaSqlDialectFactoryTest.java b/src/test/java/com/exasol/adapter/dialects/athena/AthenaSqlDialectFactoryTest.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/athena/AthenaSqlDialectFactoryTest.java rename to src/test/java/com/exasol/adapter/dialects/athena/AthenaSqlDialectFactoryTest.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/athena/AthenaSqlDialectTest.java b/src/test/java/com/exasol/adapter/dialects/athena/AthenaSqlDialectTest.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/athena/AthenaSqlDialectTest.java rename to src/test/java/com/exasol/adapter/dialects/athena/AthenaSqlDialectTest.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/bigquery/BigQueryMetadataReaderTest.java b/src/test/java/com/exasol/adapter/dialects/bigquery/BigQueryMetadataReaderTest.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/bigquery/BigQueryMetadataReaderTest.java rename to src/test/java/com/exasol/adapter/dialects/bigquery/BigQueryMetadataReaderTest.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/bigquery/BigQueryQueryRewriterTest.java b/src/test/java/com/exasol/adapter/dialects/bigquery/BigQueryQueryRewriterTest.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/bigquery/BigQueryQueryRewriterTest.java rename to src/test/java/com/exasol/adapter/dialects/bigquery/BigQueryQueryRewriterTest.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/bigquery/BigQuerySqlDialectFactoryTest.java b/src/test/java/com/exasol/adapter/dialects/bigquery/BigQuerySqlDialectFactoryTest.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/bigquery/BigQuerySqlDialectFactoryTest.java rename to src/test/java/com/exasol/adapter/dialects/bigquery/BigQuerySqlDialectFactoryTest.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/bigquery/BigQuerySqlDialectTest.java b/src/test/java/com/exasol/adapter/dialects/bigquery/BigQuerySqlDialectTest.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/bigquery/BigQuerySqlDialectTest.java rename to src/test/java/com/exasol/adapter/dialects/bigquery/BigQuerySqlDialectTest.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/bigquery/BigQuerySqlGenerationVisitorTest.java b/src/test/java/com/exasol/adapter/dialects/bigquery/BigQuerySqlGenerationVisitorTest.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/bigquery/BigQuerySqlGenerationVisitorTest.java rename to src/test/java/com/exasol/adapter/dialects/bigquery/BigQuerySqlGenerationVisitorTest.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/db2/DB2ColumnMetadataReaderTest.java b/src/test/java/com/exasol/adapter/dialects/db2/DB2ColumnMetadataReaderTest.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/db2/DB2ColumnMetadataReaderTest.java rename to src/test/java/com/exasol/adapter/dialects/db2/DB2ColumnMetadataReaderTest.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/db2/DB2MetadataReaderTest.java b/src/test/java/com/exasol/adapter/dialects/db2/DB2MetadataReaderTest.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/db2/DB2MetadataReaderTest.java rename to src/test/java/com/exasol/adapter/dialects/db2/DB2MetadataReaderTest.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/db2/DB2SqlDialectFactoryTest.java b/src/test/java/com/exasol/adapter/dialects/db2/DB2SqlDialectFactoryTest.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/db2/DB2SqlDialectFactoryTest.java rename to src/test/java/com/exasol/adapter/dialects/db2/DB2SqlDialectFactoryTest.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/db2/DB2SqlDialectIT.java b/src/test/java/com/exasol/adapter/dialects/db2/DB2SqlDialectIT.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/db2/DB2SqlDialectIT.java rename to src/test/java/com/exasol/adapter/dialects/db2/DB2SqlDialectIT.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/db2/DB2SqlDialectTest.java b/src/test/java/com/exasol/adapter/dialects/db2/DB2SqlDialectTest.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/db2/DB2SqlDialectTest.java rename to src/test/java/com/exasol/adapter/dialects/db2/DB2SqlDialectTest.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/db2/DB2SqlGenerationVisitorTest.java b/src/test/java/com/exasol/adapter/dialects/db2/DB2SqlGenerationVisitorTest.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/db2/DB2SqlGenerationVisitorTest.java rename to src/test/java/com/exasol/adapter/dialects/db2/DB2SqlGenerationVisitorTest.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/dummy/DummySqlDialect.java b/src/test/java/com/exasol/adapter/dialects/dummy/DummySqlDialect.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/dummy/DummySqlDialect.java rename to src/test/java/com/exasol/adapter/dialects/dummy/DummySqlDialect.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/dummy/DummySqlDialectFactory.java b/src/test/java/com/exasol/adapter/dialects/dummy/DummySqlDialectFactory.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/dummy/DummySqlDialectFactory.java rename to src/test/java/com/exasol/adapter/dialects/dummy/DummySqlDialectFactory.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/exasol/ExasolColumnMetadataReaderTest.java b/src/test/java/com/exasol/adapter/dialects/exasol/ExasolColumnMetadataReaderTest.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/exasol/ExasolColumnMetadataReaderTest.java rename to src/test/java/com/exasol/adapter/dialects/exasol/ExasolColumnMetadataReaderTest.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/exasol/ExasolConnectionDefinitionBuilderTest.java b/src/test/java/com/exasol/adapter/dialects/exasol/ExasolConnectionDefinitionBuilderTest.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/exasol/ExasolConnectionDefinitionBuilderTest.java rename to src/test/java/com/exasol/adapter/dialects/exasol/ExasolConnectionDefinitionBuilderTest.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/exasol/ExasolMetadataReaderTest.java b/src/test/java/com/exasol/adapter/dialects/exasol/ExasolMetadataReaderTest.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/exasol/ExasolMetadataReaderTest.java rename to src/test/java/com/exasol/adapter/dialects/exasol/ExasolMetadataReaderTest.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/exasol/ExasolQueryRewriterTest.java b/src/test/java/com/exasol/adapter/dialects/exasol/ExasolQueryRewriterTest.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/exasol/ExasolQueryRewriterTest.java rename to src/test/java/com/exasol/adapter/dialects/exasol/ExasolQueryRewriterTest.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/exasol/ExasolSqlDialectFactoryTest.java b/src/test/java/com/exasol/adapter/dialects/exasol/ExasolSqlDialectFactoryTest.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/exasol/ExasolSqlDialectFactoryTest.java rename to src/test/java/com/exasol/adapter/dialects/exasol/ExasolSqlDialectFactoryTest.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/exasol/ExasolSqlDialectIT.java b/src/test/java/com/exasol/adapter/dialects/exasol/ExasolSqlDialectIT.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/exasol/ExasolSqlDialectIT.java rename to src/test/java/com/exasol/adapter/dialects/exasol/ExasolSqlDialectIT.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/exasol/ExasolSqlDialectTest.java b/src/test/java/com/exasol/adapter/dialects/exasol/ExasolSqlDialectTest.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/exasol/ExasolSqlDialectTest.java rename to src/test/java/com/exasol/adapter/dialects/exasol/ExasolSqlDialectTest.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/exasol/OracleConnectionDefinitionBuilderTest.java b/src/test/java/com/exasol/adapter/dialects/exasol/OracleConnectionDefinitionBuilderTest.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/exasol/OracleConnectionDefinitionBuilderTest.java rename to src/test/java/com/exasol/adapter/dialects/exasol/OracleConnectionDefinitionBuilderTest.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/generic/GenericIdentifierConverterTest.java b/src/test/java/com/exasol/adapter/dialects/generic/GenericIdentifierConverterTest.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/generic/GenericIdentifierConverterTest.java rename to src/test/java/com/exasol/adapter/dialects/generic/GenericIdentifierConverterTest.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/generic/GenericMetadataReaderTest.java b/src/test/java/com/exasol/adapter/dialects/generic/GenericMetadataReaderTest.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/generic/GenericMetadataReaderTest.java rename to src/test/java/com/exasol/adapter/dialects/generic/GenericMetadataReaderTest.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/generic/GenericSqlDialectFactoryTest.java b/src/test/java/com/exasol/adapter/dialects/generic/GenericSqlDialectFactoryTest.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/generic/GenericSqlDialectFactoryTest.java rename to src/test/java/com/exasol/adapter/dialects/generic/GenericSqlDialectFactoryTest.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/generic/GenericSqlDialectIT.java b/src/test/java/com/exasol/adapter/dialects/generic/GenericSqlDialectIT.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/generic/GenericSqlDialectIT.java rename to src/test/java/com/exasol/adapter/dialects/generic/GenericSqlDialectIT.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/generic/GenericSqlDialectTest.java b/src/test/java/com/exasol/adapter/dialects/generic/GenericSqlDialectTest.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/generic/GenericSqlDialectTest.java rename to src/test/java/com/exasol/adapter/dialects/generic/GenericSqlDialectTest.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/hive/HiveColumnMetadataReaderTest.java b/src/test/java/com/exasol/adapter/dialects/hive/HiveColumnMetadataReaderTest.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/hive/HiveColumnMetadataReaderTest.java rename to src/test/java/com/exasol/adapter/dialects/hive/HiveColumnMetadataReaderTest.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/hive/HiveMetadataReaderTest.java b/src/test/java/com/exasol/adapter/dialects/hive/HiveMetadataReaderTest.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/hive/HiveMetadataReaderTest.java rename to src/test/java/com/exasol/adapter/dialects/hive/HiveMetadataReaderTest.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/hive/HiveSqlDialectFactoryTest.java b/src/test/java/com/exasol/adapter/dialects/hive/HiveSqlDialectFactoryTest.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/hive/HiveSqlDialectFactoryTest.java rename to src/test/java/com/exasol/adapter/dialects/hive/HiveSqlDialectFactoryTest.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/hive/HiveSqlDialectIT.java b/src/test/java/com/exasol/adapter/dialects/hive/HiveSqlDialectIT.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/hive/HiveSqlDialectIT.java rename to src/test/java/com/exasol/adapter/dialects/hive/HiveSqlDialectIT.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/hive/HiveSqlDialectTest.java b/src/test/java/com/exasol/adapter/dialects/hive/HiveSqlDialectTest.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/hive/HiveSqlDialectTest.java rename to src/test/java/com/exasol/adapter/dialects/hive/HiveSqlDialectTest.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/hive/HiveSqlGenerationVisitorTest.java b/src/test/java/com/exasol/adapter/dialects/hive/HiveSqlGenerationVisitorTest.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/hive/HiveSqlGenerationVisitorTest.java rename to src/test/java/com/exasol/adapter/dialects/hive/HiveSqlGenerationVisitorTest.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/impala/ImpalaMetadataReaderTest.java b/src/test/java/com/exasol/adapter/dialects/impala/ImpalaMetadataReaderTest.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/impala/ImpalaMetadataReaderTest.java rename to src/test/java/com/exasol/adapter/dialects/impala/ImpalaMetadataReaderTest.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/impala/ImpalaSqlDialectFactoryTest.java b/src/test/java/com/exasol/adapter/dialects/impala/ImpalaSqlDialectFactoryTest.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/impala/ImpalaSqlDialectFactoryTest.java rename to src/test/java/com/exasol/adapter/dialects/impala/ImpalaSqlDialectFactoryTest.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/impala/ImpalaSqlDialectIT.java b/src/test/java/com/exasol/adapter/dialects/impala/ImpalaSqlDialectIT.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/impala/ImpalaSqlDialectIT.java rename to src/test/java/com/exasol/adapter/dialects/impala/ImpalaSqlDialectIT.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/impala/ImpalaSqlDialectTest.java b/src/test/java/com/exasol/adapter/dialects/impala/ImpalaSqlDialectTest.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/impala/ImpalaSqlDialectTest.java rename to src/test/java/com/exasol/adapter/dialects/impala/ImpalaSqlDialectTest.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/mysql/MySqlColumnMetadataReaderTest.java b/src/test/java/com/exasol/adapter/dialects/mysql/MySqlColumnMetadataReaderTest.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/mysql/MySqlColumnMetadataReaderTest.java rename to src/test/java/com/exasol/adapter/dialects/mysql/MySqlColumnMetadataReaderTest.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/mysql/MySqlMetadataReaderTest.java b/src/test/java/com/exasol/adapter/dialects/mysql/MySqlMetadataReaderTest.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/mysql/MySqlMetadataReaderTest.java rename to src/test/java/com/exasol/adapter/dialects/mysql/MySqlMetadataReaderTest.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/mysql/MySqlSqlDialectFactoryTest.java b/src/test/java/com/exasol/adapter/dialects/mysql/MySqlSqlDialectFactoryTest.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/mysql/MySqlSqlDialectFactoryTest.java rename to src/test/java/com/exasol/adapter/dialects/mysql/MySqlSqlDialectFactoryTest.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/mysql/MySqlSqlDialectTest.java b/src/test/java/com/exasol/adapter/dialects/mysql/MySqlSqlDialectTest.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/mysql/MySqlSqlDialectTest.java rename to src/test/java/com/exasol/adapter/dialects/mysql/MySqlSqlDialectTest.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/oracle/OracleColumnMetadataReaderTest.java b/src/test/java/com/exasol/adapter/dialects/oracle/OracleColumnMetadataReaderTest.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/oracle/OracleColumnMetadataReaderTest.java rename to src/test/java/com/exasol/adapter/dialects/oracle/OracleColumnMetadataReaderTest.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/oracle/OracleMetadataReaderTest.java b/src/test/java/com/exasol/adapter/dialects/oracle/OracleMetadataReaderTest.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/oracle/OracleMetadataReaderTest.java rename to src/test/java/com/exasol/adapter/dialects/oracle/OracleMetadataReaderTest.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/oracle/OracleQueryRewriterTest.java b/src/test/java/com/exasol/adapter/dialects/oracle/OracleQueryRewriterTest.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/oracle/OracleQueryRewriterTest.java rename to src/test/java/com/exasol/adapter/dialects/oracle/OracleQueryRewriterTest.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/oracle/OracleSqlDialectFactoryTest.java b/src/test/java/com/exasol/adapter/dialects/oracle/OracleSqlDialectFactoryTest.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/oracle/OracleSqlDialectFactoryTest.java rename to src/test/java/com/exasol/adapter/dialects/oracle/OracleSqlDialectFactoryTest.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/oracle/OracleSqlDialectIT.java b/src/test/java/com/exasol/adapter/dialects/oracle/OracleSqlDialectIT.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/oracle/OracleSqlDialectIT.java rename to src/test/java/com/exasol/adapter/dialects/oracle/OracleSqlDialectIT.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/oracle/OracleSqlDialectTest.java b/src/test/java/com/exasol/adapter/dialects/oracle/OracleSqlDialectTest.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/oracle/OracleSqlDialectTest.java rename to src/test/java/com/exasol/adapter/dialects/oracle/OracleSqlDialectTest.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/oracle/OracleSqlGenerationVisitorTest.java b/src/test/java/com/exasol/adapter/dialects/oracle/OracleSqlGenerationVisitorTest.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/oracle/OracleSqlGenerationVisitorTest.java rename to src/test/java/com/exasol/adapter/dialects/oracle/OracleSqlGenerationVisitorTest.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/oracle/OracleTableMetadataReaderTest.java b/src/test/java/com/exasol/adapter/dialects/oracle/OracleTableMetadataReaderTest.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/oracle/OracleTableMetadataReaderTest.java rename to src/test/java/com/exasol/adapter/dialects/oracle/OracleTableMetadataReaderTest.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/postgresql/PostgreSQLColumnMetadataReaderTest.java b/src/test/java/com/exasol/adapter/dialects/postgresql/PostgreSQLColumnMetadataReaderTest.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/postgresql/PostgreSQLColumnMetadataReaderTest.java rename to src/test/java/com/exasol/adapter/dialects/postgresql/PostgreSQLColumnMetadataReaderTest.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/postgresql/PostgreSQLIdentifierConverterTest.java b/src/test/java/com/exasol/adapter/dialects/postgresql/PostgreSQLIdentifierConverterTest.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/postgresql/PostgreSQLIdentifierConverterTest.java rename to src/test/java/com/exasol/adapter/dialects/postgresql/PostgreSQLIdentifierConverterTest.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/postgresql/PostgreSQLIdentifierMappingTest.java b/src/test/java/com/exasol/adapter/dialects/postgresql/PostgreSQLIdentifierMappingTest.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/postgresql/PostgreSQLIdentifierMappingTest.java rename to src/test/java/com/exasol/adapter/dialects/postgresql/PostgreSQLIdentifierMappingTest.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/postgresql/PostgreSQLMetadataReaderTest.java b/src/test/java/com/exasol/adapter/dialects/postgresql/PostgreSQLMetadataReaderTest.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/postgresql/PostgreSQLMetadataReaderTest.java rename to src/test/java/com/exasol/adapter/dialects/postgresql/PostgreSQLMetadataReaderTest.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/postgresql/PostgreSQLSqlDialectFactoryTest.java b/src/test/java/com/exasol/adapter/dialects/postgresql/PostgreSQLSqlDialectFactoryTest.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/postgresql/PostgreSQLSqlDialectFactoryTest.java rename to src/test/java/com/exasol/adapter/dialects/postgresql/PostgreSQLSqlDialectFactoryTest.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/postgresql/PostgreSQLSqlDialectIT.java b/src/test/java/com/exasol/adapter/dialects/postgresql/PostgreSQLSqlDialectIT.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/postgresql/PostgreSQLSqlDialectIT.java rename to src/test/java/com/exasol/adapter/dialects/postgresql/PostgreSQLSqlDialectIT.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/postgresql/PostgreSQLSqlDialectTest.java b/src/test/java/com/exasol/adapter/dialects/postgresql/PostgreSQLSqlDialectTest.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/postgresql/PostgreSQLSqlDialectTest.java rename to src/test/java/com/exasol/adapter/dialects/postgresql/PostgreSQLSqlDialectTest.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/postgresql/PostgreSQLTableMetadataReaderTest.java b/src/test/java/com/exasol/adapter/dialects/postgresql/PostgreSQLTableMetadataReaderTest.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/postgresql/PostgreSQLTableMetadataReaderTest.java rename to src/test/java/com/exasol/adapter/dialects/postgresql/PostgreSQLTableMetadataReaderTest.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/postgresql/PostgresSQLSqlGenerationVisitorTest.java b/src/test/java/com/exasol/adapter/dialects/postgresql/PostgresSQLSqlGenerationVisitorTest.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/postgresql/PostgresSQLSqlGenerationVisitorTest.java rename to src/test/java/com/exasol/adapter/dialects/postgresql/PostgresSQLSqlGenerationVisitorTest.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/redshift/RedshiftColumnMetadataReaderTest.java b/src/test/java/com/exasol/adapter/dialects/redshift/RedshiftColumnMetadataReaderTest.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/redshift/RedshiftColumnMetadataReaderTest.java rename to src/test/java/com/exasol/adapter/dialects/redshift/RedshiftColumnMetadataReaderTest.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/redshift/RedshiftMetadataReaderTest.java b/src/test/java/com/exasol/adapter/dialects/redshift/RedshiftMetadataReaderTest.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/redshift/RedshiftMetadataReaderTest.java rename to src/test/java/com/exasol/adapter/dialects/redshift/RedshiftMetadataReaderTest.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/redshift/RedshiftSqlDialectFactoryTest.java b/src/test/java/com/exasol/adapter/dialects/redshift/RedshiftSqlDialectFactoryTest.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/redshift/RedshiftSqlDialectFactoryTest.java rename to src/test/java/com/exasol/adapter/dialects/redshift/RedshiftSqlDialectFactoryTest.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/redshift/RedshiftSqlDialectTest.java b/src/test/java/com/exasol/adapter/dialects/redshift/RedshiftSqlDialectTest.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/redshift/RedshiftSqlDialectTest.java rename to src/test/java/com/exasol/adapter/dialects/redshift/RedshiftSqlDialectTest.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/saphana/SapHanaDialectFactoryTest.java b/src/test/java/com/exasol/adapter/dialects/saphana/SapHanaDialectFactoryTest.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/saphana/SapHanaDialectFactoryTest.java rename to src/test/java/com/exasol/adapter/dialects/saphana/SapHanaDialectFactoryTest.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/saphana/SapHanaMetadataReaderTest.java b/src/test/java/com/exasol/adapter/dialects/saphana/SapHanaMetadataReaderTest.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/saphana/SapHanaMetadataReaderTest.java rename to src/test/java/com/exasol/adapter/dialects/saphana/SapHanaMetadataReaderTest.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/saphana/SapHanaSqlDialectTest.java b/src/test/java/com/exasol/adapter/dialects/saphana/SapHanaSqlDialectTest.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/saphana/SapHanaSqlDialectTest.java rename to src/test/java/com/exasol/adapter/dialects/saphana/SapHanaSqlDialectTest.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/sqlserver/SqlServerColumnMetadataReaderTest.java b/src/test/java/com/exasol/adapter/dialects/sqlserver/SqlServerColumnMetadataReaderTest.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/sqlserver/SqlServerColumnMetadataReaderTest.java rename to src/test/java/com/exasol/adapter/dialects/sqlserver/SqlServerColumnMetadataReaderTest.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/sqlserver/SqlServerDialectFactoryTest.java b/src/test/java/com/exasol/adapter/dialects/sqlserver/SqlServerDialectFactoryTest.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/sqlserver/SqlServerDialectFactoryTest.java rename to src/test/java/com/exasol/adapter/dialects/sqlserver/SqlServerDialectFactoryTest.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/sqlserver/SqlServerMetadataReaderTest.java b/src/test/java/com/exasol/adapter/dialects/sqlserver/SqlServerMetadataReaderTest.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/sqlserver/SqlServerMetadataReaderTest.java rename to src/test/java/com/exasol/adapter/dialects/sqlserver/SqlServerMetadataReaderTest.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/sqlserver/SqlServerSqlDialectTest.java b/src/test/java/com/exasol/adapter/dialects/sqlserver/SqlServerSqlDialectTest.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/sqlserver/SqlServerSqlDialectTest.java rename to src/test/java/com/exasol/adapter/dialects/sqlserver/SqlServerSqlDialectTest.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/sqlserver/SqlServerSqlGenerationVisitorTest.java b/src/test/java/com/exasol/adapter/dialects/sqlserver/SqlServerSqlGenerationVisitorTest.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/sqlserver/SqlServerSqlGenerationVisitorTest.java rename to src/test/java/com/exasol/adapter/dialects/sqlserver/SqlServerSqlGenerationVisitorTest.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/sybase/SybaseDialectFactoryTest.java b/src/test/java/com/exasol/adapter/dialects/sybase/SybaseDialectFactoryTest.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/sybase/SybaseDialectFactoryTest.java rename to src/test/java/com/exasol/adapter/dialects/sybase/SybaseDialectFactoryTest.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/sybase/SybaseMetadataReaderTest.java b/src/test/java/com/exasol/adapter/dialects/sybase/SybaseMetadataReaderTest.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/sybase/SybaseMetadataReaderTest.java rename to src/test/java/com/exasol/adapter/dialects/sybase/SybaseMetadataReaderTest.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/sybase/SybaseSqlDialectIT.java b/src/test/java/com/exasol/adapter/dialects/sybase/SybaseSqlDialectIT.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/sybase/SybaseSqlDialectIT.java rename to src/test/java/com/exasol/adapter/dialects/sybase/SybaseSqlDialectIT.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/sybase/SybaseSqlDialectTest.java b/src/test/java/com/exasol/adapter/dialects/sybase/SybaseSqlDialectTest.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/sybase/SybaseSqlDialectTest.java rename to src/test/java/com/exasol/adapter/dialects/sybase/SybaseSqlDialectTest.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/sybase/SybaseSqlGenerationVisitorTest.java b/src/test/java/com/exasol/adapter/dialects/sybase/SybaseSqlGenerationVisitorTest.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/sybase/SybaseSqlGenerationVisitorTest.java rename to src/test/java/com/exasol/adapter/dialects/sybase/SybaseSqlGenerationVisitorTest.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/teradata/TeradataColumnMetadataReaderTest.java b/src/test/java/com/exasol/adapter/dialects/teradata/TeradataColumnMetadataReaderTest.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/teradata/TeradataColumnMetadataReaderTest.java rename to src/test/java/com/exasol/adapter/dialects/teradata/TeradataColumnMetadataReaderTest.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/teradata/TeradataDialectFactoryTest.java b/src/test/java/com/exasol/adapter/dialects/teradata/TeradataDialectFactoryTest.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/teradata/TeradataDialectFactoryTest.java rename to src/test/java/com/exasol/adapter/dialects/teradata/TeradataDialectFactoryTest.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/teradata/TeradataMetadataReaderTest.java b/src/test/java/com/exasol/adapter/dialects/teradata/TeradataMetadataReaderTest.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/teradata/TeradataMetadataReaderTest.java rename to src/test/java/com/exasol/adapter/dialects/teradata/TeradataMetadataReaderTest.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/teradata/TeradataSqlDialectIT.java b/src/test/java/com/exasol/adapter/dialects/teradata/TeradataSqlDialectIT.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/teradata/TeradataSqlDialectIT.java rename to src/test/java/com/exasol/adapter/dialects/teradata/TeradataSqlDialectIT.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/teradata/TeradataSqlDialectTest.java b/src/test/java/com/exasol/adapter/dialects/teradata/TeradataSqlDialectTest.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/teradata/TeradataSqlDialectTest.java rename to src/test/java/com/exasol/adapter/dialects/teradata/TeradataSqlDialectTest.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/teradata/TeradataSqlGenerationVisitorTest.java b/src/test/java/com/exasol/adapter/dialects/teradata/TeradataSqlGenerationVisitorTest.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/teradata/TeradataSqlGenerationVisitorTest.java rename to src/test/java/com/exasol/adapter/dialects/teradata/TeradataSqlGenerationVisitorTest.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/logging/CapturingLogHandler.java b/src/test/java/com/exasol/logging/CapturingLogHandler.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/logging/CapturingLogHandler.java rename to src/test/java/com/exasol/logging/CapturingLogHandler.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/reflect/ReflectionException.java b/src/test/java/com/exasol/reflect/ReflectionException.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/reflect/ReflectionException.java rename to src/test/java/com/exasol/reflect/ReflectionException.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/reflect/ReflectionUtils.java b/src/test/java/com/exasol/reflect/ReflectionUtils.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/reflect/ReflectionUtils.java rename to src/test/java/com/exasol/reflect/ReflectionUtils.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/utils/SqlNodesCreator.java b/src/test/java/utils/SqlNodesCreator.java similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/utils/SqlNodesCreator.java rename to src/test/java/utils/SqlNodesCreator.java diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/test/resources/META-INF/services/com.exasol.adapter.dialects.SqlDialectFactory b/src/test/resources/META-INF/services/com.exasol.adapter.dialects.SqlDialectFactory similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/test/resources/META-INF/services/com.exasol.adapter.dialects.SqlDialectFactory rename to src/test/resources/META-INF/services/com.exasol.adapter.dialects.SqlDialectFactory diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/test/resources/integration/vschema_all_join_types.json b/src/test/resources/integration/vschema_all_join_types.json similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/test/resources/integration/vschema_all_join_types.json rename to src/test/resources/integration/vschema_all_join_types.json diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/test/resources/integration/vschema_complete_from_pushdown.json b/src/test/resources/integration/vschema_complete_from_pushdown.json similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/test/resources/integration/vschema_complete_from_pushdown.json rename to src/test/resources/integration/vschema_complete_from_pushdown.json diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/test/resources/integration/vschema_complex_inner_join.json b/src/test/resources/integration/vschema_complex_inner_join.json similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/test/resources/integration/vschema_complex_inner_join.json rename to src/test/resources/integration/vschema_complex_inner_join.json diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/test/resources/integration/vschema_full_pushdown.json b/src/test/resources/integration/vschema_full_pushdown.json similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/test/resources/integration/vschema_full_pushdown.json rename to src/test/resources/integration/vschema_full_pushdown.json diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/test/resources/integration/vschema_multiple_tables_inner_join.json b/src/test/resources/integration/vschema_multiple_tables_inner_join.json similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/test/resources/integration/vschema_multiple_tables_inner_join.json rename to src/test/resources/integration/vschema_multiple_tables_inner_join.json diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/test/resources/integration/vschema_select_list_inner_join.json b/src/test/resources/integration/vschema_select_list_inner_join.json similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/test/resources/integration/vschema_select_list_inner_join.json rename to src/test/resources/integration/vschema_select_list_inner_join.json diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/test/resources/integration/vschema_simple_inner_join.json b/src/test/resources/integration/vschema_simple_inner_join.json similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/test/resources/integration/vschema_simple_inner_join.json rename to src/test/resources/integration/vschema_simple_inner_join.json diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/test/resources/integration/vschema_simple_left_outer_join.json b/src/test/resources/integration/vschema_simple_left_outer_join.json similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/test/resources/integration/vschema_simple_left_outer_join.json rename to src/test/resources/integration/vschema_simple_left_outer_join.json diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/test/resources/integration/vschema_simple_select.json b/src/test/resources/integration/vschema_simple_select.json similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/test/resources/integration/vschema_simple_select.json rename to src/test/resources/integration/vschema_simple_select.json diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/test/resources/integration/vschema_table_alias_pushdown.json b/src/test/resources/integration/vschema_table_alias_pushdown.json similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/test/resources/integration/vschema_table_alias_pushdown.json rename to src/test/resources/integration/vschema_table_alias_pushdown.json diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/test/resources/logging.properties b/src/test/resources/logging.properties similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/test/resources/logging.properties rename to src/test/resources/logging.properties diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/test/resources/pushdown_request.json b/src/test/resources/pushdown_request.json similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/test/resources/pushdown_request.json rename to src/test/resources/pushdown_request.json diff --git a/jdbc-adapter/virtualschema-jdbc-adapter/src/test/resources/pushdown_request_alltypes.json b/src/test/resources/pushdown_request_alltypes.json similarity index 100% rename from jdbc-adapter/virtualschema-jdbc-adapter/src/test/resources/pushdown_request_alltypes.json rename to src/test/resources/pushdown_request_alltypes.json diff --git a/jdbc-adapter/tools/create_kerberos_conn.py b/tools/create_kerberos_conn.py similarity index 100% rename from jdbc-adapter/tools/create_kerberos_conn.py rename to tools/create_kerberos_conn.py diff --git a/jdbc-adapter/tools/install_vs.sh b/tools/install_vs.sh similarity index 100% rename from jdbc-adapter/tools/install_vs.sh rename to tools/install_vs.sh diff --git a/jdbc-adapter/tools/version.sh b/tools/version.sh similarity index 96% rename from jdbc-adapter/tools/version.sh rename to tools/version.sh index e495d30ef..c2b5cf01a 100755 --- a/jdbc-adapter/tools/version.sh +++ b/tools/version.sh @@ -3,8 +3,8 @@ readonly vs_jar_prefix='virtualschema-jdbc-adapter-dist' readonly jar_suffix='jar' readonly vs_jar_pattern="$vs_jar_prefix-.*\.$jar_suffix" readonly root_dir='virtual-schemas' -readonly master_pom='jdbc-adapter/pom.xml' -readonly file_find_regex='.*\.(md|yaml)' +readonly master_pom='pom.xml' +readonly file_find_regex='.*\.(md|yaml|java)' readonly script=$(basename $0) main() {