MONDRIAN: Integrating change #13016, fixes for PSW-56 and PSW-57. upd…

…ated logic for lazy loading table column information, also added resource to text.properties to avoid error messages in console. [git-p4: depot-paths = "//open/mondrian-release/3.1/": change = 13017]
pentaho · Aug 25, 2009 · d3a6776 · d3a6776
1 parent b778963
commit d3a6776
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 34 deletions.
diff --git a/src/main/mondrian/gui/JdbcMetaData.java b/src/main/mondrian/gui/JdbcMetaData.java
@@ -355,38 +355,25 @@ private void setPKey(DbTable dbt) {
     private void setColumns(String schemaName, String tableName) {
         LOGGER.debug(
             "setColumns: <" + tableName + "> in schema <" + schemaName + ">");
-
-        if (initConnection() != null) {
-            return;
-        }
-
-        if (schemaName == null) {
-            schemaName = jdbcSchema;
-        }
-
-        DbSchema dbs = db.getSchema(schemaName);
-
-        if (dbs == null) {
-            throw new RuntimeException(
-                "No schema with name: <" + schemaName + ">");
-        }
-
-        DbTable dbt = dbs.getTable(tableName);
-
+        DbTable dbt = db.getTable(schemaName, tableName);
         if (dbt == null) {
-            throw new RuntimeException(
+            LOGGER.debug(
                 "No table with name: <"
                 + tableName
                 + "> in schema <"
                 + schemaName
                 + ">");
+            return;
+        }
+        if (initConnection() != null) {
+            return;
+        }
+        try {
+            setColumns(dbt);
+            LOGGER.debug("got " + dbt.colsDataType.size() + " columns");
+        } finally {
+            closeConnection();
         }
-
-        setColumns(dbt);
-
-        LOGGER.debug("got " + dbt.colsDataType.size() + " columns");
-
-        closeConnection();
     }
 
     /**
@@ -768,14 +755,9 @@ private DbTable getTable(String sname, String tableName) {
         }
 
         private boolean hasColumns(String schemaName, String tableName) {
-            DbSchema dbs = getSchema(schemaName);
-
-            if (dbs != null) {
-                DbTable t = dbs.getTable(tableName);
-
-                if (t != null) {
-                    return t.hasColumns();
-                }
+            DbTable table = getTable(schemaName, tableName);
+            if (table != null) {
+                return table.hasColumns();
             }
             return false;
         }

diff --git a/src/main/mondrian/gui/PreferencesDialog.java b/src/main/mondrian/gui/PreferencesDialog.java
@@ -267,7 +267,7 @@ public void actionPerformed(ActionEvent evt) {
         jPanel1.add(selectSchemasButton, gridBagConstraints);
 
         // Disable the select schemas button for now
-        selectSchemasButton.setEnabled(false);
+        selectSchemasButton.setVisible(false);
 
         requireSchemaButton.setSelected(false);
         gridBagConstraints = new java.awt.GridBagConstraints();

diff --git a/src/main/mondrian/gui/resources/text.properties b/src/main/mondrian/gui/resources/text.properties
@@ -334,6 +334,7 @@ queryPanel.selectedSchema.alert=selected Schema
 queryPanel.unsuccessfulConnection.exception=Mondrian connection could not be done for - {0}
 
 preferences.pane.title=Database Connection
+preferences.selectSchemasButton.title=Select Schemas
 preferences.driverClassName.title=Driver Class Name
 preferences.connectionURL.title=Connection URL
 preferences.userName.title=User name