CAY-2885 Modeler: DbImport fails to load DB schema view

Author: stariy95

RELEASE-NOTES.txt

@@ -25,6 +25,7 @@ CAY-2872 CayenneModeler "Documentation" link is broken
 CAY-2876 Memory leak in the ObjectStore
 CAY-2879 Negative number for non parameterized ObjectSelect query not processed correctly
 CAY-2883 License and notice templates are not processed by the Gradle build
+CAY-2885 Modeler: DbImport fails to load DB schema view
 
 ----------------------------------
 Release: 5.0-M1

modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/LoadDbSchemaAction.java

@@ -128,7 +128,7 @@ private void loadDataBase(DBConnectionInfo connectionInfo) throws Exception {
 
     private void loadTables(DBConnectionInfo connectionInfo,
                             TreePath tablePath,
-                            DbImportView rootParent) throws SQLException {
+                            DbImportView rootParent) throws Exception {
         ReverseEngineering databaseReverseEngineering = new DatabaseSchemaLoader()
                 .loadTables(connectionInfo,
                         getApplication().getClassLoadingService(),

modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/dbimport/DatabaseSchemaLoader.java

@@ -125,9 +125,10 @@ private void processSchemas(Connection connection,
     public ReverseEngineering loadTables(DBConnectionInfo connectionInfo,
                                          ClassLoadingService loadingService,
                                          TreePath path,
-                                         String[] tableTypesFromConfig) throws SQLException {
+                                         String[] tableTypesFromConfig) throws Exception {
         int pathIndex = 1;
         String catalogName = null, schemaName = null;
+        DbAdapter adapter = connectionInfo.makeAdapter(loadingService);
 
         Object userObject = getUserObjectOrNull(path, pathIndex);
         if (userObject != null) {
@@ -158,7 +159,10 @@ public ReverseEngineering loadTables(DBConnectionInfo connectionInfo,
                     String table = resultSet.getString("TABLE_NAME");
                     String schema = resultSet.getString("TABLE_SCHEM");
                     String catalog = resultSet.getString("TABLE_CAT");
-                    packTable(table, catalog == null ? catalogName : catalog, schema, null);
+                    String realCatalogName = catalog == null || !adapter.supportsCatalogsOnReverseEngineering()
+                            ? catalogName
+                            : catalog;
+                    packTable(table, realCatalogName, schema, null);
                 }
                 if (!hasTables && (catalogName != null || schemaName != null)) {
                     packFilterContainer(catalogName, schemaName);