[Sqlshell-svn] /devel/src/main/java/nl/improved/sqlclient

[SVN by r. <sv...@ca...>]

Author: roy
Date: 2009-04-26 16:07:47 +0200 (Sun, 26 Apr 2009)
New Revision: 409

Modified:
   src/main/java/nl/improved/sqlclient/AbstractSQLShellWindow.java
   src/main/java/nl/improved/sqlclient/DBConnector.java
Log:
show views as well (not working currently on oracle...)


Modified: src/main/java/nl/improved/sqlclient/AbstractSQLShellWindow.java
===================================================================
--- src/main/java/nl/improved/sqlclient/AbstractSQLShellWindow.java	2009-04-26 13:20:44 UTC (rev 408)
+++ src/main/java/nl/improved/sqlclient/AbstractSQLShellWindow.java	2009-04-26 14:07:47 UTC (rev 409)
@@ -886,7 +886,7 @@
     protected List<String> getTableNames() {
         List<String> returnValue = new ArrayList<String>();
         try {
-            ResultSet rs = getConnection().getMetaData().getTables(getConnection().getCatalog(), DBConnector.getInstance().getSchema(), null, new String[]{"TABLE"});
+            ResultSet rs = getConnection().getMetaData().getTables(getConnection().getCatalog(), DBConnector.getInstance().getSchema(), "%", new String[]{"%"});
             while (rs.next()) {
                 if (!returnValue.contains(rs.getString("TABLE_NAME"))) {
                     returnValue.add(rs.getString("TABLE_NAME"));

Modified: src/main/java/nl/improved/sqlclient/DBConnector.java
===================================================================
--- src/main/java/nl/improved/sqlclient/DBConnector.java	2009-04-26 13:20:44 UTC (rev 408)
+++ src/main/java/nl/improved/sqlclient/DBConnector.java	2009-04-26 14:07:47 UTC (rev 409)
@@ -197,7 +197,7 @@
         try {
             DatabaseMetaData metaData = activeConnection.getMetaData();
             ResultSet rs = metaData.getTables(activeConnection.getCatalog(), getSchema()
-                    , null, new String[]{"TABLE"});
+                    , null, null);
             while (rs.next()) {
                 String tableName = rs.getString("TABLE_NAME");
                 tableNames.put(tableName.toLowerCase(), tableName);