Initial commit

javalite · Jul 15, 2019 · 2858abb · 2858abb
1 parent 54e07ca
commit 2858abb
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/activejdbc/src/main/java/org/javalite/activejdbc/Registry.java b/activejdbc/src/main/java/org/javalite/activejdbc/Registry.java
@@ -188,7 +188,14 @@ private Map<String, ColumnMetadata> fetchMetaParams(DatabaseMetaData databaseMet
          */
         String[] names = table.split("\\.", 3);
 
-        String schema = databaseMetaData.getConnection().getSchema();
+        String schema = null; //
+
+        try {
+            if(databaseMetaData.getClass().getMethod("getSchema")!=null){
+                schema = databaseMetaData.getConnection().getSchema();
+            }
+        } catch (NoSuchMethodException e) {}
+
         String tableName;
 
         switch (names.length) {
@@ -207,8 +214,12 @@ private Map<String, ColumnMetadata> fetchMetaParams(DatabaseMetaData databaseMet
         default:
             throw new DBException("invalid table name: " + table);
         }
-
-        String catalog = databaseMetaData.getConnection().getCatalog();
+        String catalog = null;
+        try {
+            if(databaseMetaData.getClass().getMethod("getCatalog")!=null){
+                catalog = databaseMetaData.getConnection().getCatalog();
+            }
+        } catch (NoSuchMethodException e) {}
 
         if(dbType.equalsIgnoreCase("h2")){
             // keep quoted table names as is, otherwise use uppercase

diff --git a/classes/artifacts/activejdbc_jar/activejdbc.zip b/classes/artifacts/activejdbc_jar/activejdbc.zip