Support for unquoted Postgres identifiers (fix for #74)

jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/AbstractSqlDialect.java

@@ -3,11 +3,7 @@
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Types;
-import java.util.EnumMap;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 
 import com.exasol.adapter.jdbc.ColumnAdapterNotes;
 import com.exasol.adapter.jdbc.JdbcAdapterProperties;
@@ -40,7 +36,7 @@ public String getTableCatalogAndSchemaSeparator() {
     }
 
     @Override
-    public MappedTable mapTable(final ResultSet tables) throws SQLException {
+    public MappedTable mapTable(final ResultSet tables, List<String> ignoreErrorList) throws SQLException {
         String commentString = tables.getString("REMARKS");
         if (commentString == null) {
             commentString = "";

jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/SqlDialect.java

@@ -3,6 +3,7 @@
 import java.sql.DatabaseMetaData;
 import java.sql.ResultSet;
 import java.sql.SQLException;
+import java.util.List;
 import java.util.Map;
 
 import com.exasol.adapter.capabilities.Capabilities;
@@ -153,9 +154,10 @@ public String getTableComment() {
      * @param tables A jdbc Resultset for the
      *               {@link DatabaseMetaData#getTables(String, String, String, String[])}
      *               call, pointing to the current table.
+     * @param ignoreErrorList
      * @return An instance of {@link MappedTable} describing the mapped table.
      */
-    public MappedTable mapTable(ResultSet tables) throws SQLException;
+    public MappedTable mapTable(ResultSet tables, List<String> ignoreErrorList) throws SQLException;
 
     /**
      * @param columns A jdbc Resultset for the

jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/impl/OracleSqlDialect.java

@@ -4,6 +4,7 @@
 import java.sql.SQLException;
 import java.sql.Types;
 import java.util.EnumMap;
+import java.util.List;
 import java.util.Map;
 
 import com.exasol.adapter.capabilities.AggregateFunctionCapability;
@@ -331,7 +332,7 @@ public SchemaOrCatalogSupport supportsJdbcSchemas() {
     }
 
     @Override
-    public MappedTable mapTable(final ResultSet tables) throws SQLException {
+    public MappedTable mapTable(final ResultSet tables, List<String> ignoreErrorList) throws SQLException {
         final String tableName = tables.getString("TABLE_NAME");
         if (tableName.startsWith("BIN$")) {
             // In case of Oracle we may see deleted tables with strange names
@@ -341,7 +342,7 @@ public MappedTable mapTable(final ResultSet tables) throws SQLException {
             System.out.println("Skip table: " + tableName);
             return MappedTable.createIgnoredTable();
         } else {
-            return super.mapTable(tables);
+            return super.mapTable(tables, ignoreErrorList);
         }
     }
 

jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/impl/PostgreSQLSqlDialect.java

@@ -1,8 +1,10 @@
 package com.exasol.adapter.dialects.impl;
 
+import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Types;
 import java.util.EnumMap;
+import java.util.List;
 import java.util.Map;
 
 import com.exasol.adapter.capabilities.AggregateFunctionCapability;
@@ -20,6 +22,9 @@
 import com.exasol.adapter.sql.ScalarFunction;
 
 public class PostgreSQLSqlDialect extends AbstractSqlDialect {
+
+    public static final String POSTGRES_IGNORE_UPPERCASE_TABLES = "POSTGRES_IGNORE_UPPERCASE_TABLES";
+
     public PostgreSQLSqlDialect(final SqlDialectContext context) {
         super(context);
     }
@@ -298,6 +303,24 @@ public DataType dialectSpecificMapJdbcType(final JdbcTypeDescription jdbcTypeDes
         return colType;
     }
 
+    @Override
+    public MappedTable mapTable(final ResultSet tables, List<String> ignoreErrorList) throws SQLException {
+        final String tableName = tables.getString("TABLE_NAME");
+        if (ignoreErrorList.contains(POSTGRES_IGNORE_UPPERCASE_TABLES)) {
+            return super.mapTable(tables, ignoreErrorList);
+        }
+        if (containsUppercaseCharacter(tableName)) {
+            throw new IllegalArgumentException("Table " + tableName + " cannot be used in virtual schema. " +
+                    "Set property IGNORE_ERROR_LIST to POSTGRES_IGNORE_UPPERCASE_TABLES to enforce schema creation.");
+        } else {
+            return super.mapTable(tables, ignoreErrorList);
+        }
+    }
+
+    private boolean containsUppercaseCharacter(String tableName) {
+        return !tableName.equals(tableName.toLowerCase());
+    }
+
     @Override
     public Map<ScalarFunction, String> getScalarFunctionAliases() {
 
@@ -345,7 +368,7 @@ public IdentifierCaseHandling getQuotedIdentifierHandling() {
 
     @Override
     public String applyQuote(final String identifier) {
-        return "\"" + identifier.replace("\"", "\"\"") + "\"";
+        return "\"" + identifier.toLowerCase().replace("\"", "\"\"") + "\"";
     }
 
     @Override

jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/jdbc/JdbcAdapter.java

@@ -135,7 +135,8 @@ private static SchemaMetadata readMetadata(final SchemaMetadataInfo meta, final
         return JdbcMetadataReader.readRemoteMetadata(connection.getAddress(), connection.getUser(),
                 connection.getPassword(), catalog, schema, tables,
                 JdbcAdapterProperties.getSqlDialectName(meta.getProperties()),
-                JdbcAdapterProperties.getExceptionHandlingMode(meta.getProperties()));
+                JdbcAdapterProperties.getExceptionHandlingMode(meta.getProperties()),
+                JdbcAdapterProperties.getIgnoreErrorList(meta.getProperties()));
     }
 
     private static String handleRefresh(final RefreshRequest request, final ExaMetadata meta)
@@ -165,7 +166,8 @@ private static String handleSetProperty(final SetPropertiesRequest request, fina
                     connection.getUser(), connection.getPassword(), JdbcAdapterProperties.getCatalog(newSchemaMeta),
                     JdbcAdapterProperties.getSchema(newSchemaMeta), tableFilter,
                     JdbcAdapterProperties.getSqlDialectName(newSchemaMeta),
-                    JdbcAdapterProperties.getExceptionHandlingMode(newSchemaMeta));
+                    JdbcAdapterProperties.getExceptionHandlingMode(newSchemaMeta),
+                    JdbcAdapterProperties.getIgnoreErrorList(newSchemaMeta));
             return ResponseJsonSerializer.makeSetPropertiesResponse(remoteMeta);
         }
         return ResponseJsonSerializer.makeSetPropertiesResponse(null);

jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/jdbc/JdbcAdapterProperties.java

@@ -7,6 +7,7 @@
 import java.util.Map;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+import java.util.stream.Collectors;
 
 import com.exasol.ExaConnectionAccessException;
 import com.exasol.ExaConnectionInformation;
@@ -43,6 +44,7 @@ public final class JdbcAdapterProperties {
     static final String PROP_EXCLUDED_CAPABILITIES = "EXCLUDED_CAPABILITIES";
     static final String PROP_EXCEPTION_HANDLING = "EXCEPTION_HANDLING";
     static final String PROP_LOG_LEVEL = "LOG_LEVEL";
+    static final String PROP_IGNORE_ERROR_LIST = "IGNORE_ERROR_LIST";
 
     private static final String DEFAULT_LOG_LEVEL = "INFO";
 
@@ -64,6 +66,12 @@ private static String getProperty(final Map<String, String> properties, final St
         }
     }
 
+    public static List<String> getIgnoreErrorList(final Map<String, String> properties) {
+        String ignoreErrors = getProperty(properties, PROP_IGNORE_ERROR_LIST, "");
+        List<String> ignoreErrorsList = Arrays.asList(ignoreErrors.split(","));
+        return ignoreErrorsList.stream().map(error -> error.trim().toUpperCase()).collect(Collectors.toList());
+    }
+
     public static String getCatalog(final Map<String, String> properties) {
         return getProperty(properties, PROP_CATALOG_NAME, "");
     }

jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/jdbc/JdbcMetadataReader.java

@@ -20,7 +20,7 @@ public class JdbcMetadataReader {
 
     public static SchemaMetadata readRemoteMetadata(final String connectionString, final String user,
             final String password, String catalog, String schema, final List<String> tableFilter,
-            final String dialectName, final JdbcAdapterProperties.ExceptionHandlingMode exceptionMode)
+            final String dialectName, final JdbcAdapterProperties.ExceptionHandlingMode exceptionMode, final List<String> ignoreErrorList)
             throws SQLException, AdapterException {
         assert (catalog != null);
         assert (schema != null);
@@ -45,7 +45,7 @@ public static SchemaMetadata readRemoteMetadata(final String connectionString, f
 
             schema = findSchema(schema, dbMeta, dialect);
 
-            final List<TableMetadata> tables = findTables(catalog, schema, tableFilter, dbMeta, dialect, exceptionMode);
+            final List<TableMetadata> tables = findTables(catalog, schema, tableFilter, dbMeta, dialect, exceptionMode, ignoreErrorList);
 
             conn.close();
             return new SchemaMetadata(SchemaAdapterNotes.serialize(schemaAdapterNotes), tables);
@@ -242,8 +242,8 @@ private static String findSchema(final String schema, final DatabaseMetaData dbM
     }
 
     private static List<TableMetadata> findTables(final String catalog, final String schema,
-            final List<String> tableFilter, final DatabaseMetaData dbMeta, final SqlDialect dialect,
-            final JdbcAdapterProperties.ExceptionHandlingMode exceptionMode) throws SQLException {
+                                                  final List<String> tableFilter, final DatabaseMetaData dbMeta, final SqlDialect dialect,
+                                                  final JdbcAdapterProperties.ExceptionHandlingMode exceptionMode, List<String> ignoreErrorList) throws SQLException {
         final List<TableMetadata> tables = new ArrayList<>();
 
         final String[] supportedTableTypes = { "TABLE", "VIEW", "SYSTEM TABLE" };
@@ -252,7 +252,7 @@ private static List<TableMetadata> findTables(final String catalog, final String
         final List<SqlDialect.MappedTable> tablesMapped = new ArrayList<>();
         // List<String> tableComments = new ArrayList<>();
         while (resTables.next()) {
-            final SqlDialect.MappedTable mappedTable = dialect.mapTable(resTables);
+            final SqlDialect.MappedTable mappedTable = dialect.mapTable(resTables, ignoreErrorList);
             if (!mappedTable.isIgnored()) {
                 tablesMapped.add(mappedTable);
                 // tableComments.add(mappedTable.getTableComment());

jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/impl/ExasolSqlDialectIT.java

@@ -9,6 +9,7 @@
 import java.sql.Statement;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 
 import org.junit.Assume;
@@ -308,7 +309,7 @@ public void testDifferentDataTypes()
         final List<String> tables = new ArrayList<>(Arrays.asList(tableNames));
         final SchemaMetadata meta = JdbcMetadataReader.readRemoteMetadata("jdbc:exa:" + getConfig().getExasolAddress(),
                 getConfig().getExasolUser(), getConfig().getExasolPassword(), "EXA_DB", "JDBC_ADAPTER_TEST_SCHEMA",
-                tables, ExasolSqlDialect.getPublicName(), getConfig().getExceptionHandlingMode());
+                tables, ExasolSqlDialect.getPublicName(), getConfig().getExceptionHandlingMode(), Collections.emptyList());
         if (getConfig().isDebugOn()) {
             System.out.println("Meta: " + SchemaMetadataSerializer.serialize(meta).build().toString());
         }

jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/impl/PostgreSQLSqlDialectTest.java

@@ -0,0 +1,67 @@
+package com.exasol.adapter.dialects.impl;
+
+import com.exasol.adapter.dialects.SqlDialectContext;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.Mock;
+import static org.mockito.Mockito.*;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import static org.junit.Assert.*;
+import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.when;
+
+public class PostgreSQLSqlDialectTest {
+    @Mock
+    SqlDialectContext sqlDialectContext;
+
+
+    @Before
+    public void setUp() throws SQLException {
+
+    }
+
+    @Test
+    public void applyQuoteOnUpperCase() {
+        PostgreSQLSqlDialect postgresDialect = new PostgreSQLSqlDialect(sqlDialectContext);
+        assertEquals("\"abc\"", postgresDialect.applyQuote("ABC"));
+    }
+
+    @Test
+    public void applyQuoteOnMixedCase() {
+        PostgreSQLSqlDialect postgresDialect = new PostgreSQLSqlDialect(sqlDialectContext);
+        assertEquals("\"abcde\"", postgresDialect.applyQuote("AbCde"));
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void mapTableWithUpperCaseCharacters() throws SQLException {
+        ResultSet resultSet = mock(ResultSet.class);
+        when(resultSet.getString("TABLE_NAME")).thenReturn("uPPer");
+        PostgreSQLSqlDialect postgresDialect = new PostgreSQLSqlDialect(sqlDialectContext);
+        postgresDialect.mapTable(resultSet, Collections.emptyList());
+    }
+
+    @Test
+    public void mapTableWithLowerCaseCharacters() throws SQLException {
+        ResultSet resultSet = mock(ResultSet.class);
+        when(resultSet.getString("TABLE_NAME")).thenReturn("lower");
+        PostgreSQLSqlDialect postgresDialect = new PostgreSQLSqlDialect(sqlDialectContext);
+        postgresDialect.mapTable(resultSet, Collections.emptyList());
+    }
+
+    @Test
+    public void mapTableWithIgnoreUppercaseCharactersError() throws SQLException {
+        ResultSet resultSet = mock(ResultSet.class);
+        when(resultSet.getString("TABLE_NAME")).thenReturn("Upper");
+        List<String> ignoreList = new ArrayList<>();
+        ignoreList.add("Dummy_Error");
+        ignoreList.add("POSTGRES_IGNORE_UPPERCASE_TABLES");
+        PostgreSQLSqlDialect postgresDialect = new PostgreSQLSqlDialect(sqlDialectContext);
+        postgresDialect.mapTable(resultSet, ignoreList);
+    }
+}

jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/jdbc/JdbcAdapterPropertiesTest.java

@@ -2,6 +2,7 @@
 
 import static org.junit.Assert.assertEquals;
 
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -246,4 +247,15 @@ public void testNoneAsExceptionValue() throws AdapterException {
                 JdbcAdapterProperties.getExceptionHandlingMode(properties));
         JdbcAdapterProperties.checkPropertyConsistency(properties);
     }
+
+    @Test
+    public void getIgnoreErrorList() {
+        Map<String, String> properties = new HashMap<>();
+        properties.put("IGNORE_ERROR_LIST", "ERrror_foo, error_bar    ,  another_error");
+        List<String> expectedErrorList = new ArrayList<>();
+        expectedErrorList.add("ERRROR_FOO");
+        expectedErrorList.add("ERROR_BAR");
+        expectedErrorList.add("ANOTHER_ERROR");
+        assertEquals(expectedErrorList, JdbcAdapterProperties.getIgnoreErrorList(properties));
+    }
 }