#124: Added support for external tables. Added Redshift/Spectrum colu…

…mn mappings. # Conflicts: # jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/jdbc/AbstractMetadataReader.java # jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/redshift/RedshiftColumnMetadataReaderTest.java # jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/redshift/RedshiftMetadataReaderTest.java # jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/jdbc/BaseRemoteMetadataReaderTest.java
exasol · May 3, 2019 · bfcc54e · bfcc54e
1 parent b04147b
commit bfcc54e
Show file tree

Hide file tree

Showing 9 changed files with 66 additions and 16 deletions.
diff --git a/...pter/src/main/java/com/exasol/adapter/dialects/redshift/RedshiftColumnMetadataReader.java b/...pter/src/main/java/com/exasol/adapter/dialects/redshift/RedshiftColumnMetadataReader.java
@@ -2,6 +2,7 @@
 
 import java.sql.Connection;
 import java.sql.Types;
+import java.util.logging.Logger;
 
 import com.exasol.adapter.AdapterProperties;
 import com.exasol.adapter.dialects.IdentifierConverter;
@@ -13,6 +14,8 @@
  * This class implements a Redshift-specific column metadata reader
  */
 public class RedshiftColumnMetadataReader extends BaseColumnMetadataReader {
+    private static final Logger LOGGER = Logger.getLogger(RedshiftColumnMetadataReader.class.getName());
+
     /**
      * Create a new instance of a {@link RedshiftColumnMetadataReader}
      *
@@ -27,10 +30,24 @@ public RedshiftColumnMetadataReader(final Connection connection, final AdapterPr
 
     @Override
     public DataType mapJdbcType(final JdbcTypeDescription jdbcTypeDescription) {
-        if (jdbcTypeDescription.getJdbcType() == Types.NUMERIC) {
+        switch (jdbcTypeDescription.getJdbcType()) {
+        case Types.NUMERIC:
             return mapJdbcTypeNumericToDecimalWithFallbackToDouble(jdbcTypeDescription);
-        } else {
+        case Types.OTHER:
+            return mapJdbcTypeOther(jdbcTypeDescription);
+        default:
             return super.mapJdbcType(jdbcTypeDescription);
         }
     }
+
+    protected DataType mapJdbcTypeOther(final JdbcTypeDescription jdbcTypeDescription) {
+        final String originalDataTypeName = jdbcTypeDescription.getTypeName();
+        if ("double".equals(originalDataTypeName)) {
+            return DataType.createDouble();
+        } else {
+            LOGGER.finer(() -> "Mapping JDBC type OTHER [" + jdbcTypeDescription.getTypeName()
+                    + "] to maximum size VARCHAR.");
+        }
+        return DataType.createMaximumSizeVarChar(DataType.ExaCharset.UTF8);
+    }
 }
diff --git a/...bc-adapter/src/main/java/com/exasol/adapter/dialects/redshift/RedshiftMetadataReader.java b/...bc-adapter/src/main/java/com/exasol/adapter/dialects/redshift/RedshiftMetadataReader.java
@@ -1,6 +1,7 @@
 package com.exasol.adapter.dialects.redshift;
 
 import java.sql.Connection;
+import java.util.*;
 
 import com.exasol.adapter.AdapterProperties;
 import com.exasol.adapter.jdbc.*;
@@ -29,4 +30,10 @@ protected TableMetadataReader createTableMetadataReader() {
         return new RedshiftTableMetadataReader(this.connection, getColumnMetadataReader(), this.properties,
                 getIdentifierConverter());
     }
+
+    @Override
+    public Set<String> getSupportedTableTypes() {
+        return Collections
+                .unmodifiableSet(new HashSet<>(Arrays.asList("TABLE", "VIEW", "SYSTEM TABLE", "EXTERNAL TABLE")));
+    }
 }
diff --git a/...tualschema-jdbc-adapter/src/main/java/com/exasol/adapter/jdbc/AbstractMetadataReader.java b/...tualschema-jdbc-adapter/src/main/java/com/exasol/adapter/jdbc/AbstractMetadataReader.java
@@ -12,7 +12,6 @@
  * @see BaseColumnMetadataReader
  */
 public abstract class AbstractMetadataReader implements MetadataReader {
-    static final String ANY_CATALOG_FILTER = null;
     protected final AdapterProperties properties;
     protected final Connection connection;
 

diff --git a/...alschema-jdbc-adapter/src/main/java/com/exasol/adapter/jdbc/BaseRemoteMetadataReader.java b/...alschema-jdbc-adapter/src/main/java/com/exasol/adapter/jdbc/BaseRemoteMetadataReader.java
@@ -1,11 +1,9 @@
 package com.exasol.adapter.jdbc;
 
 import static com.exasol.adapter.jdbc.RemoteMetadataReaderConstants.ANY_TABLE;
-import static com.exasol.adapter.jdbc.RemoteMetadataReaderConstants.SUPPORTED_TABLE_TYPES;
 
 import java.sql.*;
-import java.util.List;
-import java.util.Optional;
+import java.util.*;
 import java.util.logging.Logger;
 
 import com.exasol.adapter.AdapterProperties;
@@ -115,11 +113,16 @@ private List<TableMetadata> extractTableMetadata(final DatabaseMetaData remoteMe
         final String schemaName = getSchemaNameFilter();
         logTablesScan(catalogName, schemaName);
         try (final ResultSet remoteTables = remoteMetadata.getTables(catalogName, schemaName, ANY_TABLE,
-                SUPPORTED_TABLE_TYPES.toArray(new String[0]))) {
+                getSupportedTableTypes().toArray(new String[0]))) {
             return mapTables(remoteTables, selectedTables);
         }
     }
 
+    @Override
+    public Set<String> getSupportedTableTypes() {
+        return RemoteMetadataReaderConstants.DEFAULT_SUPPORTED_TABLE_TYPES;
+    }
+
     protected void logTablesScan(final String catalogName, final String schemaName) {
         LOGGER.fine(() -> {
             final StringBuilder builder = new StringBuilder("Scanning \"");
@@ -133,11 +136,11 @@ protected void logTablesScan(final String catalogName, final String schemaName)
             if (schemaName == null) {
                 builder.append("any schema ");
             } else {
-                builder.append("\", schema \"");
+                builder.append("schema \"");
                 builder.append(schemaName);
                 builder.append("\" ");
             }
-            builder.append(" for contained tables.");
+            builder.append("for contained tables.");
             return builder.toString();
         });
     }

diff --git a/...irtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/jdbc/RemoteMetadataReader.java b/...irtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/jdbc/RemoteMetadataReader.java
@@ -1,6 +1,7 @@
 package com.exasol.adapter.jdbc;
 
 import java.util.List;
+import java.util.Set;
 
 import com.exasol.adapter.metadata.SchemaMetadata;
 
@@ -43,4 +44,11 @@ public interface RemoteMetadataReader extends MetadataReader {
      * @return table metadata reader
      */
     public TableMetadataReader getTableMetadataReader();
+
+    /**
+     * Get the table types the remote metadata reader supports
+     *
+     * @return set of table type names
+     */
+    public Set<String> getSupportedTableTypes();
 }
diff --git a/...ema-jdbc-adapter/src/main/java/com/exasol/adapter/jdbc/RemoteMetadataReaderConstants.java b/...ema-jdbc-adapter/src/main/java/com/exasol/adapter/jdbc/RemoteMetadataReaderConstants.java
@@ -13,9 +13,9 @@ private RemoteMetadataReaderConstants() {
     public static final String ANY_CATALOG = null;
     public static final String ANY_SCHEMA = null;
     public static final String ANY_TABLE = "%";
-    public static final Set<String> SUPPORTED_TABLE_TYPES = Collections
-            .unmodifiableSet(new HashSet<>(Arrays.asList("TABLE", "VIEW", "SYSTEM TABLE")));
     public static final String ANY_COLUMN = "%";
     public static final String JDBC_TRUE = "yes";
     public static final String JDBC_FALSE = "no";
+    public static final Set<String> DEFAULT_SUPPORTED_TABLE_TYPES = Collections
+            .unmodifiableSet(new HashSet<>(Arrays.asList("TABLE", "VIEW", "SYSTEM TABLE")));
 }
diff --git a/.../src/test/java/com/exasol/adapter/dialects/redshift/RedshiftColumnMetadataReaderTest.java b/.../src/test/java/com/exasol/adapter/dialects/redshift/RedshiftColumnMetadataReaderTest.java
@@ -34,4 +34,10 @@ void testMapJdbcTypeFallbackToParent() {
         assertThat(this.columnMetadataReader.mapJdbcType(new JdbcTypeDescription(Types.BOOLEAN, 0, 0, 0, "")),
                 equalTo(DataType.createBool()));
     }
-}
+
+    @Test
+    void testMapJdbcTypeOtherDouble() {
+        assertThat(this.columnMetadataReader.mapJdbcType(new JdbcTypeDescription(Types.OTHER, 0, 0, 0, "double")),
+                equalTo(DataType.createDouble()));
+    }
+}
diff --git a/...dapter/src/test/java/com/exasol/adapter/dialects/redshift/RedshiftMetadataReaderTest.java b/...dapter/src/test/java/com/exasol/adapter/dialects/redshift/RedshiftMetadataReaderTest.java
@@ -1,7 +1,6 @@
 package com.exasol.adapter.dialects.redshift;
 
-import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.instanceOf;
+import static org.hamcrest.Matchers.*;
 import static org.junit.Assert.assertThat;
 import static org.junit.jupiter.api.Assertions.assertAll;
 
@@ -41,4 +40,10 @@ void testGetIdentifierConverter() {
                 () -> assertThat(converter.getUnquotedIdentifierHandling(),
                         equalTo(IdentifierCaseHandling.INTERPRET_AS_UPPER)));
     }
+
+    @Test
+    void testGetSupportedTableTypes() {
+        assertThat(this.reader.getSupportedTableTypes(),
+                containsInAnyOrder("TABLE", "VIEW", "SYSTEM TABLE", "EXTERNAL TABLE"));
+    }
 }
diff --git a/...hema-jdbc-adapter/src/test/java/com/exasol/adapter/jdbc/BaseRemoteMetadataReaderTest.java b/...hema-jdbc-adapter/src/test/java/com/exasol/adapter/jdbc/BaseRemoteMetadataReaderTest.java
@@ -187,7 +187,7 @@ void testReadRemoteMetadataWithAdapterNotes() throws RemoteMetadataReaderExcepti
     @Test
     void testGetCatalogNameFilterDefaultsToAny() {
         final BaseRemoteMetadataReader reader = new BaseRemoteMetadataReader(null, AdapterProperties.emptyProperties());
-        assertThat(reader.getCatalogNameFilter(), equalTo(AbstractMetadataReader.ANY_CATALOG_FILTER));
+        assertThat(reader.getCatalogNameFilter(), equalTo(RemoteMetadataReaderConstants.ANY_CATALOG));
     }
 
     @Test
@@ -203,7 +203,7 @@ void testGetCatalogNameFilter() {
     @Test
     void testGetSchemaNameFilterDefaultsToAny() {
         final BaseRemoteMetadataReader reader = new BaseRemoteMetadataReader(null, AdapterProperties.emptyProperties());
-        assertThat(reader.getSchemaNameFilter(), equalTo(AbstractMetadataReader.ANY_CATALOG_FILTER));
+        assertThat(reader.getSchemaNameFilter(), equalTo(RemoteMetadataReaderConstants.ANY_SCHEMA));
     }
 
     @Test
@@ -243,6 +243,11 @@ void testCreateIdentifierConverter() {
                         equalTo(IdentifierCaseHandling.INTERPRET_AS_UPPER)),
                 () -> assertThat(reader.getIdentifierConverter().getQuotedIdentifierHandling(),
                         equalTo(IdentifierCaseHandling.INTERPRET_CASE_SENSITIVE)));
+    }
 
+    @Test
+    void testGetSupportedTableTypes() {
+        assertThat(new BaseRemoteMetadataReader(null, AdapterProperties.emptyProperties()).getSupportedTableTypes(),
+                containsInAnyOrder("TABLE", "VIEW", "SYSTEM TABLE"));
     }
 }