0003039: Wildcard table names don't work on Informix

JumpMind · Apr 4, 2017 · 5a66ef9 · 5a66ef9
1 parent 2d551c6
commit 5a66ef9
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 1 deletion.
diff --git a/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/informix/InformixDatabasePlatform.java b/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/informix/InformixDatabasePlatform.java
@@ -71,7 +71,10 @@ public String getName() {
     }
 
     public String getDefaultCatalog() {
-        return null;
+//        if (StringUtils.isBlank(defaultCatalog)) {
+//            defaultCatalog = getSqlTemplate().queryForObject("select trim(sqc_currdb) from sysmaster:syssqlcurall where sqc_sessionid = dbinfo('sessionid')", String.class);
+//        }
+        return defaultCatalog;
     }
 
     public String getDefaultSchema() {

diff --git a/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/informix/InformixDdlReader.java b/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/informix/InformixDdlReader.java
@@ -20,6 +20,8 @@
  */
 package org.jumpmind.db.platform.informix;
 
+import static org.apache.commons.lang.StringUtils.isBlank;
+
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
@@ -50,8 +52,22 @@ public InformixDdlReader(IDatabasePlatform platform) {
         super(platform);
         setDefaultCatalogPattern(null);
         setDefaultSchemaPattern(null);
+    }    
+
+    @Override
+    protected Table readTable(Connection connection, DatabaseMetaDataWrapper metaData, Map<String, Object> values) throws SQLException {
+        String catalog = metaData.getCatalog();
+        Table t =  super.readTable(connection, metaData, values);
+        if (t != null && (isBlank(catalog) || catalog.equals(getDefaultCatalogPattern()))) {
+            /* The default catalog is null so by default if no 
+             * catalog is provided it must be null as well */
+            t.setCatalog(null);
+        }
+        return t;
     }
+
 
+    @SuppressWarnings({ "rawtypes", "unchecked" })
     @Override
     public Collection<IIndex> readIndices(Connection connection, DatabaseMetaDataWrapper metaData,
             String tableName) throws SQLException {