Move method getDatabaseName() which returns the database name for a given tenant...

diff --git a/services/common/src/main/java/org/collectionspace/services/common/storage/JDBCTools.java b/services/common/src/main/java/org/collectionspace/services/common/storage/JDBCTools.java
index 4074db550cced8b033ddf420037b61a13f1932d8..0d40e42179c264bc3254a8e9aaaceb5884eb6bff 100644 (file)
--- a/services/common/src/main/java/org/collectionspace/services/common/storage/JDBCTools.java
+++ b/services/common/src/main/java/org/collectionspace/services/common/storage/JDBCTools.java
@@ -232,16 +232,17 @@ public class JDBCTools {
      * \r
      * @return the database product name\r
      */\r
-    public static String getDatabaseProductName() {\r
+    public static String getDatabaseProductName(String dataSourceName,\r
+               String repositoryName) {\r
        if (DBProductName == null) {\r
                Connection conn = null;\r
                try {\r
-                   conn = getConnection(CSPACE_DATASOURCE_NAME, DEFAULT_CSPACE_DATABASE_NAME);\r
+                   conn = getConnection(dataSourceName, repositoryName);\r
                    DBProductName = conn.getMetaData().getDatabaseProductName();\r
                } catch (Exception e) {\r
                        if (logger.isTraceEnabled() == true) {\r
                                logger.trace(String.format("Could not open a connection. DataSource='%s' DB='%s'.",\r
-                                               CSPACE_DATASOURCE_NAME, DEFAULT_CSPACE_DATABASE_NAME));\r
+                                               dataSourceName, repositoryName));\r
                        }\r
                } finally {\r
                    try {\r
@@ -269,14 +270,13 @@ public class JDBCTools {
                String repositoryName) throws Exception {\r
        DatabaseProductType result = DatabaseProductType.UNRECOGNIZED;\r
        \r
-        String productName = getDatabaseProductName();\r
+        String productName = getDatabaseProductName(dataSourceName, repositoryName);\r
         if (productName.matches("(?i).*mysql.*")) {\r
                result = DatabaseProductType.MYSQL;\r
         } else if (productName.matches("(?i).*postgresql.*")) {\r
                result = DatabaseProductType.POSTGRESQL;\r
         } else {\r
-            throw new Exception("Unrecognized database system " \r
-                                               + productName);\r
+            throw new Exception("Unrecognized database system " + productName);\r
         }\r
        \r
         return result;\r
@@ -297,7 +297,7 @@ public class JDBCTools {
     }\r
     \r
     /**\r
-     * Returns the catalog name for an open JDBC connection.\r
+     * Returns the catalog/database name for an open JDBC connection.\r
      * \r
      * @param conn an open JDBC Connection\r
      * @return the catalog name.\r