Title: [883] trunk/activerecord-jdbc/src/java/jdbc_adapter/ JdbcAdapterInternalService.java: Final fix for JRUBY-1966.
Revision
883
Author
olabini
Date
2008-01-18 03:19:54 -0500 (Fri, 18 Jan 2008)

Log Message

Final fix for JRUBY-1966. Instead of searching for just tables, search for views and tables.

Modified Paths

Diff

Modified: trunk/activerecord-jdbc/src/java/jdbc_adapter/JdbcAdapterInternalService.java (882 => 883)


--- trunk/activerecord-jdbc/src/java/jdbc_adapter/JdbcAdapterInternalService.java	2008-01-17 21:02:31 UTC (rev 882)
+++ trunk/activerecord-jdbc/src/java/jdbc_adapter/JdbcAdapterInternalService.java	2008-01-18 08:19:54 UTC (rev 883)
@@ -452,6 +452,12 @@
                         schemas.close();
                     }
 
+                    RubyArray matchingTables = (RubyArray) tableLookupBlock(recv.getRuntime(), 
+                                                                            c.getCatalog(), schemaName, table_name, new String[]{"TABLE","VIEW"}).call(c);
+                    if (matchingTables.isEmpty()) {
+                        throw new SQLException("Table " + table_name + " does not exist");
+                    }
+
                     results = metadata.getColumns(c.getCatalog(),schemaName,table_name,null);
                     return unmarshal_columns(recv, metadata, results);
                 } finally {
_______________________________________________
Jruby-extras-devel mailing list
[email protected]
http://rubyforge.org/mailman/listinfo/jruby-extras-devel

Reply via email to