Add recognition of MQTs and ALIASes as table types for DB2

jruby · Apr 10, 2012 · 0e7d069 · 0e7d069
1 parent c2a1395
commit 0e7d069
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/lib/arjdbc/jdbc/adapter_java.jar b/lib/arjdbc/jdbc/adapter_java.jar
diff --git a/src/java/arjdbc/db2/DB2RubyJdbcConnection.java b/src/java/arjdbc/db2/DB2RubyJdbcConnection.java
@@ -37,10 +37,17 @@
  * @author mikestone
  */
 public class DB2RubyJdbcConnection extends RubyJdbcConnection {
+    private static final String[] TABLE_TYPES = new String[]{"TABLE", "VIEW", "SYNONYM", "MATERIALIZED QUERY TABLE", "ALIAS"};
+
     protected DB2RubyJdbcConnection(Ruby runtime, RubyClass metaClass) {
         super(runtime, metaClass);
     }
 
+    @Override
+    protected String[] getTableTypes() {
+        return TABLE_TYPES;
+    }
+
     @Override
     protected boolean databaseSupportsSchemas() {
         return true;

diff --git a/src/java/arjdbc/jdbc/RubyJdbcConnection.java b/src/java/arjdbc/jdbc/RubyJdbcConnection.java
@@ -77,6 +77,7 @@
  */
 public class RubyJdbcConnection extends RubyObject {
     private static final String[] TABLE_TYPE = new String[]{"TABLE"};
+    private static final String[] TABLE_TYPES = new String[]{"TABLE", "VIEW", "SYNONYM"};
 
     private static RubyObjectAdapter rubyApi;
 
@@ -104,6 +105,10 @@ protected static RubyModule getConnectionAdapters(Ruby runtime) {
         return (RubyModule) runtime.getModule("ActiveRecord").getConstant("ConnectionAdapters");
     }
 
+    protected String[] getTableTypes() {
+        return TABLE_TYPES;
+    }
+
     @JRubyMethod(name = "begin")
     public IRubyObject begin(ThreadContext context) throws SQLException {
         final Ruby runtime = context.getRuntime();
@@ -126,9 +131,8 @@ public Object call(Connection c) throws SQLException {
                     String tableName = rubyApi.convertToRubyString(args[0]).getUnicodeValue();
                     TableNameComponents components = extractTableNameComponents(c, defaultSchema, tableName);
 
-                    String[] tableTypes = new String[]{"TABLE","VIEW","SYNONYM"};
                     RubyArray matchingTables = (RubyArray) tableLookupBlock(context.getRuntime(),
-                            components.catalog, components.schema, components.table, tableTypes, false).call(c);
+                            components.catalog, components.schema, components.table, getTableTypes(), false).call(c);
                     if (matchingTables.isEmpty()) {
                         throw new SQLException("Table " + tableName + " does not exist");
                     }