#389: Improved connection error handling.

exasol · Sep 28, 2020 · 3bd6632 · 3bd6632
1 parent 5835b8d
commit 3bd6632
Show file tree

Hide file tree

Showing 16 changed files with 64 additions and 30 deletions.
diff --git a/doc/changes/changes_4.0.4.md b/doc/changes/changes_4.0.4.md
@@ -12,7 +12,8 @@ Code name:
 ## Refactoring
 
 * #263: Removed SybaseMetadataReader class as it was not used by the dialect.
-* #381: Migrated from version.sh to artifact-reference-checker-maven-plugin
+* #381: Migrated from version.sh to artifact-reference-checker-maven-plugin.
+* #389: Improved connection error handling.
 
 ## Dependency updates
 

diff --git a/src/main/java/com/exasol/adapter/dialects/athena/AthenaSqlDialect.java b/src/main/java/com/exasol/adapter/dialects/athena/AthenaSqlDialect.java
@@ -1,14 +1,15 @@
 package com.exasol.adapter.dialects.athena;
 
-import static com.exasol.adapter.AdapterProperties.*;
+import static com.exasol.adapter.AdapterProperties.CATALOG_NAME_PROPERTY;
+import static com.exasol.adapter.AdapterProperties.SCHEMA_NAME_PROPERTY;
 import static com.exasol.adapter.capabilities.AggregateFunctionCapability.*;
 import static com.exasol.adapter.capabilities.LiteralCapability.*;
 import static com.exasol.adapter.capabilities.MainCapability.*;
 import static com.exasol.adapter.capabilities.PredicateCapability.*;
 import static com.exasol.adapter.capabilities.ScalarFunctionCapability.*;
 
 import java.sql.SQLException;
-import java.util.*;
+import java.util.Set;
 
 import com.exasol.adapter.AdapterProperties;
 import com.exasol.adapter.capabilities.Capabilities;
@@ -138,7 +139,8 @@ protected RemoteMetadataReader createRemoteMetadataReader() {
         try {
             return new AthenaMetadataReader(this.connectionFactory.getConnection(), this.properties);
         } catch (final SQLException exception) {
-            throw new RemoteMetadataReaderException("Unable to create Athena remote metadata reader.", exception);
+            throw new RemoteMetadataReaderException(
+                    "Unable to create Athena remote metadata reader. Caused by: " + exception.getMessage(), exception);
         }
     }
 

diff --git a/src/main/java/com/exasol/adapter/dialects/bigquery/BigQuerySqlDialect.java b/src/main/java/com/exasol/adapter/dialects/bigquery/BigQuerySqlDialect.java
@@ -1,6 +1,7 @@
 package com.exasol.adapter.dialects.bigquery;
 
-import static com.exasol.adapter.AdapterProperties.*;
+import static com.exasol.adapter.AdapterProperties.CATALOG_NAME_PROPERTY;
+import static com.exasol.adapter.AdapterProperties.SCHEMA_NAME_PROPERTY;
 import static com.exasol.adapter.capabilities.AggregateFunctionCapability.*;
 import static com.exasol.adapter.capabilities.LiteralCapability.*;
 import static com.exasol.adapter.capabilities.MainCapability.*;
@@ -45,7 +46,9 @@ protected RemoteMetadataReader createRemoteMetadataReader() {
         try {
             return new BigQueryMetadataReader(this.connectionFactory.getConnection(), this.properties);
         } catch (final SQLException exception) {
-            throw new RemoteMetadataReaderException("Unable to create BigQuery remote metadata reader.", exception);
+            throw new RemoteMetadataReaderException(
+                    "Unable to create BigQuery remote metadata reader. Caused by: " + exception.getMessage(),
+                    exception);
         }
 
     }

diff --git a/src/main/java/com/exasol/adapter/dialects/db2/DB2SqlDialect.java b/src/main/java/com/exasol/adapter/dialects/db2/DB2SqlDialect.java
@@ -38,7 +38,8 @@ protected RemoteMetadataReader createRemoteMetadataReader() {
         try {
             return new DB2MetadataReader(this.connectionFactory.getConnection(), this.properties);
         } catch (final SQLException exception) {
-            throw new RemoteMetadataReaderException("Unable to create DB2 remote metadata reader.", exception);
+            throw new RemoteMetadataReaderException(
+                    "Unable to create DB2 remote metadata reader. Caused by: " + exception.getMessage(), exception);
         }
     }
 

diff --git a/src/main/java/com/exasol/adapter/dialects/generic/GenericSqlDialect.java b/src/main/java/com/exasol/adapter/dialects/generic/GenericSqlDialect.java
@@ -1,9 +1,10 @@
 package com.exasol.adapter.dialects.generic;
 
-import static com.exasol.adapter.AdapterProperties.*;
+import static com.exasol.adapter.AdapterProperties.CATALOG_NAME_PROPERTY;
+import static com.exasol.adapter.AdapterProperties.SCHEMA_NAME_PROPERTY;
 
 import java.sql.SQLException;
-import java.util.*;
+import java.util.Set;
 
 import com.exasol.adapter.AdapterProperties;
 import com.exasol.adapter.adapternotes.SchemaAdapterNotes;
@@ -87,7 +88,9 @@ protected RemoteMetadataReader createRemoteMetadataReader() {
             return new GenericMetadataReader(this.connectionFactory.getConnection(), this.properties);
         } catch (final SQLException exception) {
             throw new RemoteMetadataReaderException(
-                    "Unable to create remote metadata reader for the generic SQL dialect.", exception);
+                    "Unable to create remote metadata reader for the generic SQL dialect. Caused by: "
+                            + exception.getMessage(),
+                    exception);
         }
     }
 

diff --git a/src/main/java/com/exasol/adapter/dialects/hive/HiveSqlDialect.java b/src/main/java/com/exasol/adapter/dialects/hive/HiveSqlDialect.java
@@ -1,6 +1,7 @@
 package com.exasol.adapter.dialects.hive;
 
-import static com.exasol.adapter.AdapterProperties.*;
+import static com.exasol.adapter.AdapterProperties.CATALOG_NAME_PROPERTY;
+import static com.exasol.adapter.AdapterProperties.SCHEMA_NAME_PROPERTY;
 import static com.exasol.adapter.capabilities.AggregateFunctionCapability.*;
 import static com.exasol.adapter.capabilities.LiteralCapability.*;
 import static com.exasol.adapter.capabilities.MainCapability.*;
@@ -123,7 +124,8 @@ protected RemoteMetadataReader createRemoteMetadataReader() {
         try {
             return new HiveMetadataReader(this.connectionFactory.getConnection(), this.properties);
         } catch (final SQLException exception) {
-            throw new RemoteMetadataReaderException("Unable to create Hive remote metadata reader.", exception);
+            throw new RemoteMetadataReaderException(
+                    "Unable to create Hive remote metadata reader. Caused by: " + exception.getMessage(), exception);
         }
     }
 

diff --git a/src/main/java/com/exasol/adapter/dialects/impala/ImpalaSqlDialect.java b/src/main/java/com/exasol/adapter/dialects/impala/ImpalaSqlDialect.java
@@ -1,6 +1,7 @@
 package com.exasol.adapter.dialects.impala;
 
-import static com.exasol.adapter.AdapterProperties.*;
+import static com.exasol.adapter.AdapterProperties.CATALOG_NAME_PROPERTY;
+import static com.exasol.adapter.AdapterProperties.SCHEMA_NAME_PROPERTY;
 import static com.exasol.adapter.capabilities.AggregateFunctionCapability.*;
 import static com.exasol.adapter.capabilities.LiteralCapability.*;
 import static com.exasol.adapter.capabilities.MainCapability.*;
@@ -121,7 +122,8 @@ protected RemoteMetadataReader createRemoteMetadataReader() {
         try {
             return new ImpalaMetadataReader(this.connectionFactory.getConnection(), this.properties);
         } catch (final SQLException exception) {
-            throw new RemoteMetadataReaderException("Unable to create Impala remote metadata reader.", exception);
+            throw new RemoteMetadataReaderException(
+                    "Unable to create Impala remote metadata reader. Caused by: " + exception.getMessage(), exception);
         }
     }
 

diff --git a/src/main/java/com/exasol/adapter/dialects/mysql/MySqlSqlDialect.java b/src/main/java/com/exasol/adapter/dialects/mysql/MySqlSqlDialect.java
@@ -110,7 +110,8 @@ protected RemoteMetadataReader createRemoteMetadataReader() {
         try {
             return new MySqlMetadataReader(this.connectionFactory.getConnection(), this.properties);
         } catch (final SQLException exception) {
-            throw new RemoteMetadataReaderException("Unable to create MySQL remote metadata reader.", exception);
+            throw new RemoteMetadataReaderException(
+                    "Unable to create MySQL remote metadata reader. Caused by: " + exception.getMessage(), exception);
         }
     }
 

diff --git a/src/main/java/com/exasol/adapter/dialects/oracle/OracleSqlDialect.java b/src/main/java/com/exasol/adapter/dialects/oracle/OracleSqlDialect.java
@@ -1,6 +1,7 @@
 package com.exasol.adapter.dialects.oracle;
 
-import static com.exasol.adapter.AdapterProperties.*;
+import static com.exasol.adapter.AdapterProperties.IS_LOCAL_PROPERTY;
+import static com.exasol.adapter.AdapterProperties.SCHEMA_NAME_PROPERTY;
 import static com.exasol.adapter.capabilities.AggregateFunctionCapability.*;
 import static com.exasol.adapter.capabilities.LiteralCapability.*;
 import static com.exasol.adapter.capabilities.MainCapability.*;
@@ -152,7 +153,8 @@ protected RemoteMetadataReader createRemoteMetadataReader() {
         try {
             return new OracleMetadataReader(this.connectionFactory.getConnection(), this.properties);
         } catch (final SQLException exception) {
-            throw new RemoteMetadataReaderException("Unable to create Oracle remote metadata reader.", exception);
+            throw new RemoteMetadataReaderException(
+                    "Unable to create Oracle remote metadata reader. Caused by: " + exception.getMessage(), exception);
         }
     }
 

diff --git a/src/main/java/com/exasol/adapter/dialects/postgresql/PostgreSQLSqlDialect.java b/src/main/java/com/exasol/adapter/dialects/postgresql/PostgreSQLSqlDialect.java
@@ -75,7 +75,9 @@ protected RemoteMetadataReader createRemoteMetadataReader() {
         try {
             return new PostgreSQLMetadataReader(this.connectionFactory.getConnection(), this.properties);
         } catch (final SQLException exception) {
-            throw new RemoteMetadataReaderException("Unable to create PostgreSQL remote metadata reader.", exception);
+            throw new RemoteMetadataReaderException(
+                    "Unable to create PostgreSQL remote metadata reader. Caused by: " + exception.getMessage(),
+                    exception);
         }
     }
 

diff --git a/src/main/java/com/exasol/adapter/dialects/redshift/RedshiftSqlDialect.java b/src/main/java/com/exasol/adapter/dialects/redshift/RedshiftSqlDialect.java
@@ -1,6 +1,7 @@
 package com.exasol.adapter.dialects.redshift;
 
-import static com.exasol.adapter.AdapterProperties.*;
+import static com.exasol.adapter.AdapterProperties.CATALOG_NAME_PROPERTY;
+import static com.exasol.adapter.AdapterProperties.SCHEMA_NAME_PROPERTY;
 import static com.exasol.adapter.capabilities.AggregateFunctionCapability.*;
 import static com.exasol.adapter.capabilities.LiteralCapability.*;
 import static com.exasol.adapter.capabilities.MainCapability.*;
@@ -121,7 +122,9 @@ protected RemoteMetadataReader createRemoteMetadataReader() {
         try {
             return new RedshiftMetadataReader(this.connectionFactory.getConnection(), this.properties);
         } catch (final SQLException exception) {
-            throw new RemoteMetadataReaderException("Unable to create Redshift remote metadata reader.", exception);
+            throw new RemoteMetadataReaderException(
+                    "Unable to create Redshift remote metadata reader. Caused by: " + exception.getMessage(),
+                    exception);
         }
     }
 

diff --git a/src/main/java/com/exasol/adapter/dialects/saphana/SapHanaSqlDialect.java b/src/main/java/com/exasol/adapter/dialects/saphana/SapHanaSqlDialect.java
@@ -1,6 +1,7 @@
 package com.exasol.adapter.dialects.saphana;
 
-import static com.exasol.adapter.AdapterProperties.*;
+import static com.exasol.adapter.AdapterProperties.CATALOG_NAME_PROPERTY;
+import static com.exasol.adapter.AdapterProperties.SCHEMA_NAME_PROPERTY;
 import static com.exasol.adapter.capabilities.AggregateFunctionCapability.*;
 import static com.exasol.adapter.capabilities.LiteralCapability.*;
 import static com.exasol.adapter.capabilities.MainCapability.*;
@@ -120,7 +121,8 @@ protected RemoteMetadataReader createRemoteMetadataReader() {
         try {
             return new SapHanaMetadataReader(this.connectionFactory.getConnection(), this.properties);
         } catch (final SQLException exception) {
-            throw new RemoteMetadataReaderException("Unable to create HANA remote metadata reader.", exception);
+            throw new RemoteMetadataReaderException(
+                    "Unable to create HANA remote metadata reader. Caused by: " + exception.getMessage(), exception);
         }
     }
 

diff --git a/src/main/java/com/exasol/adapter/dialects/sqlserver/SqlServerSqlDialect.java b/src/main/java/com/exasol/adapter/dialects/sqlserver/SqlServerSqlDialect.java
@@ -1,6 +1,7 @@
 package com.exasol.adapter.dialects.sqlserver;
 
-import static com.exasol.adapter.AdapterProperties.*;
+import static com.exasol.adapter.AdapterProperties.CATALOG_NAME_PROPERTY;
+import static com.exasol.adapter.AdapterProperties.SCHEMA_NAME_PROPERTY;
 import static com.exasol.adapter.capabilities.AggregateFunctionCapability.*;
 import static com.exasol.adapter.capabilities.LiteralCapability.*;
 import static com.exasol.adapter.capabilities.MainCapability.*;
@@ -135,7 +136,9 @@ protected RemoteMetadataReader createRemoteMetadataReader() {
         try {
             return new SqlServerMetadataReader(this.connectionFactory.getConnection(), this.properties);
         } catch (final SQLException exception) {
-            throw new RemoteMetadataReaderException("Unable to create SQL Server remote metadata reader.", exception);
+            throw new RemoteMetadataReaderException(
+                    "Unable to create SQL Server remote metadata reader. Caused by: " + exception.getMessage(),
+                    exception);
         }
     }
 

diff --git a/src/main/java/com/exasol/adapter/dialects/sybase/SybaseSqlDialect.java b/src/main/java/com/exasol/adapter/dialects/sybase/SybaseSqlDialect.java
@@ -1,6 +1,7 @@
 package com.exasol.adapter.dialects.sybase;
 
-import static com.exasol.adapter.AdapterProperties.*;
+import static com.exasol.adapter.AdapterProperties.CATALOG_NAME_PROPERTY;
+import static com.exasol.adapter.AdapterProperties.SCHEMA_NAME_PROPERTY;
 import static com.exasol.adapter.capabilities.AggregateFunctionCapability.*;
 import static com.exasol.adapter.capabilities.LiteralCapability.*;
 import static com.exasol.adapter.capabilities.MainCapability.*;
@@ -136,7 +137,8 @@ protected RemoteMetadataReader createRemoteMetadataReader() {
         try {
             return new BaseRemoteMetadataReader(this.connectionFactory.getConnection(), this.properties);
         } catch (final SQLException exception) {
-            throw new RemoteMetadataReaderException("Unable to create Sybase remote metadata reader.", exception);
+            throw new RemoteMetadataReaderException(
+                    "Unable to create Sybase remote metadata reader. Caused by: " + exception.getMessage(), exception);
         }
     }
 

diff --git a/src/main/java/com/exasol/adapter/dialects/teradata/TeradataSqlDialect.java b/src/main/java/com/exasol/adapter/dialects/teradata/TeradataSqlDialect.java
@@ -68,7 +68,9 @@ protected RemoteMetadataReader createRemoteMetadataReader() {
         try {
             return new TeradataMetadataReader(this.connectionFactory.getConnection(), this.properties);
         } catch (final SQLException exception) {
-            throw new RemoteMetadataReaderException("Unable to create Teradata remote metadata reader.", exception);
+            throw new RemoteMetadataReaderException(
+                    "Unable to create Teradata remote metadata reader. Caused by: " + exception.getMessage(),
+                    exception);
         }
     }
 

diff --git a/src/test/java/com/exasol/adapter/dialects/dummy/DummySqlDialect.java b/src/test/java/com/exasol/adapter/dialects/dummy/DummySqlDialect.java
@@ -1,9 +1,10 @@
 package com.exasol.adapter.dialects.dummy;
 
-import static com.exasol.adapter.AdapterProperties.*;
+import static com.exasol.adapter.AdapterProperties.EXCEPTION_HANDLING_PROPERTY;
+import static com.exasol.adapter.AdapterProperties.SCHEMA_NAME_PROPERTY;
 
 import java.sql.SQLException;
-import java.util.*;
+import java.util.Set;
 
 import com.exasol.adapter.AdapterProperties;
 import com.exasol.adapter.capabilities.Capabilities;
@@ -66,7 +67,9 @@ protected RemoteMetadataReader createRemoteMetadataReader() {
         try {
             return new BaseRemoteMetadataReader(this.connectionFactory.getConnection(), this.properties);
         } catch (final SQLException exception) {
-            throw new RemoteMetadataReaderException("Unable to create remote metadata reader for the Dummy dialect.",
+            throw new RemoteMetadataReaderException(
+                    "Unable to create remote metadata reader for the Dummy dialect. Caused by: "
+                            + exception.getMessage(),
                     exception);
         }
     }