#6241 Generic driver: package read fix

plugins/org.jkiss.dbeaver.ext.generic/src/org/jkiss/dbeaver/ext/generic/model/GenericObjectContainer.java

@@ -276,7 +276,7 @@ public abstract class GenericObjectContainer implements GenericStructContainer,D
         if (procedures == null) {
             loadProcedures(monitor);
         }
-        return packages == null ? null : packages;
+        return packages;
     }
 
     public GenericPackage getPackage(DBRProgressMonitor monitor, String name)

plugins/org.jkiss.dbeaver.ext.generic/src/org/jkiss/dbeaver/ext/generic/model/meta/GenericMetaModel.java

@@ -252,23 +252,21 @@ public class GenericMetaModel {
                         specificName = procedureName;
                     }
                     procedureName = GenericUtils.normalizeProcedureName(procedureName);
-                    // Check for packages. Oracle (and may be some other databases) uses catalog name as storage for package name
-                    String packageName = null;
-                    GenericPackage procedurePackage = null;
-                    if (!CommonUtils.isEmpty(procedureCatalog) && CommonUtils.isEmpty(dataSource.getCatalogs())) {
-                        // Catalog name specified while there are no catalogs in data source
-                        packageName = procedureCatalog;
-                    }
 
-                    if (!CommonUtils.isEmpty(packageName)) {
-                        if (packageMap == null) {
-                            packageMap = new TreeMap<>();
-                        }
-                        procedurePackage = packageMap.get(packageName);
-                        if (procedurePackage == null) {
-                            procedurePackage = new GenericPackage(container, packageName, true);
-                            packageMap.put(packageName, procedurePackage);
-                            container.addPackage(procedurePackage);
+                    GenericPackage procedurePackage = null;
+                    // FIXME: remove as a silly workaround
+                    String packageName = getPackageName(dataSource, procedureCatalog, procedureName, specificName);
+                    if (packageName != null) {
+                        if (!CommonUtils.isEmpty(packageName)) {
+                            if (packageMap == null) {
+                                packageMap = new TreeMap<>();
+                            }
+                            procedurePackage = packageMap.get(packageName);
+                            if (procedurePackage == null) {
+                                procedurePackage = new GenericPackage(container, packageName, true);
+                                packageMap.put(packageName, procedurePackage);
+                                container.addPackage(procedurePackage);
+                            }
                         }
                     }
 
@@ -372,6 +370,20 @@ public class GenericMetaModel {
         return "-- Source code not available";
     }
 
+    public String getPackageName(GenericDataSource dataSource, String catalogName, String procedureName, String specificName) {
+
+        // Caused problems in #6241. Probably we should remove it (for now getPackageName always returns null so it is disabled anyway)
+        if (!CommonUtils.isEmpty(catalogName) && CommonUtils.isEmpty(dataSource.getCatalogs())) {
+            // Check for packages. Oracle (and may be some other databases) uses catalog name as a storage for package name
+            // In fact it is a legacy code from ancient times (before Oracle extension was added).
+
+            // Catalog name specified while there are no catalogs in data source
+            //return catalogName;
+        }
+
+        return null;
+    }
+
     //////////////////////////////////////////////////////
     // Catalog load