Multiple catalogs choice (GitHub issue 17): Bug fixes and clarificati…

…ons.
squirrel-sql-client · Aug 27, 2023 · b162f23 · b162f23
1 parent f0e8522
commit b162f23
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/.../net/sourceforge/squirrel_sql/client/gui/session/catalogspanel/AliasCatalogLoadModel.java b/.../net/sourceforge/squirrel_sql/client/gui/session/catalogspanel/AliasCatalogLoadModel.java
@@ -105,11 +105,14 @@ public List<String> getCatalogStringsToLoad()
    /**
     * Just to represent a simple caller given catalog name.
     * Maybe if one day complexity grows this class will become an interface with two implementations.
+    *
+    * The catalogName parameter is null regularly, especially for databases that don't support schemas.
     */
    public static AliasCatalogLoadModel of(String catalogName)
    {
       AliasCatalogLoadModel ret = new AliasCatalogLoadModel();
-      ret._catalogNamesToLoad = List.of(catalogName);
+      ret._catalogNamesToLoad = new ArrayList<>();
+      ret._catalogNamesToLoad.add(catalogName);
       return ret;
    }
 }
diff --git a/...et/sourceforge/squirrel_sql/client/gui/session/catalogspanel/CatalogsPanelController.java b/...et/sourceforge/squirrel_sql/client/gui/session/catalogspanel/CatalogsPanelController.java
@@ -148,8 +148,9 @@ private void refreshSchemaAndTree()
       api.refreshTree(true);
 
       String schema = null;
-      if (DialectFactory.isMSSQLServer(_session.getSQLConnection().getSQLMetaData()) || DialectFactory.isSyBase(_session.getSQLConnection().getSQLMetaData()))
+      if (DialectFactory.isMSSQLServer(_session.getSQLConnection().getSQLMetaData()))
       {
+         // dbo is MSSQL's default schema.
          schema = "dbo";
       }
 

diff --git a/.../src/net/sourceforge/squirrel_sql/client/gui/session/catalogspanel/I18NStrings.properties b/.../src/net/sourceforge/squirrel_sql/client/gui/session/catalogspanel/I18NStrings.properties
@@ -6,7 +6,8 @@ CatalogsPanel.configure.catalogs.to.load=Configure additional catalogs to load .
 AdditionalCatalogsDlg.title=Choose additional catalogs to load
 
 AdditionalCatalogsDlg.explain=By default, SQuirreL does not specify catalogs when it loads schema data (tables, ...) \
-  but relies on the connections current catalog (which can be switched by the catalogs drop down).\
-  Here users can choose catalogs that are loaded additionally to SQuirreL's standard schema data loading.
+  but relies on the database's built in behaviour which in some cases depends on the connections current catalog. \
+  (The current catalog can be switched by the catalogs drop down). \
+  Here users can choose catalogs that should be loaded additionally to SQuirreL's default schema data loading.
 
 AdditionalCatalogsDlg.ok=Ok