From: Aron Roberts <aron@socrates.berkeley.edu>
Date: Wed, 19 Mar 2014 00:17:32 +0000 (-0700)
Subject: CSPACE-6343: Updated the ReportPostInitHandler to use an instance-qualified database... 
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=ec556e74d5e1c4e9d38397048cbe2a639cdb124e;p=tmp%2Fjakarta-migration.git

CSPACE-6343: Updated the ReportPostInitHandler to use an instance-qualified database name, rather than assuming that the repository name matches the database name.
---

diff --git a/services/report/service/src/main/java/org/collectionspace/services/report/nuxeo/ReportPostInitHandler.java b/services/report/service/src/main/java/org/collectionspace/services/report/nuxeo/ReportPostInitHandler.java
index f8c2c0201..d2f437503 100644
--- a/services/report/service/src/main/java/org/collectionspace/services/report/nuxeo/ReportPostInitHandler.java
+++ b/services/report/service/src/main/java/org/collectionspace/services/report/nuxeo/ReportPostInitHandler.java
@@ -83,7 +83,8 @@ public class ReportPostInitHandler extends InitHandler implements IInitHandler {
             } else if(databaseProductType != DatabaseProductType.POSTGRESQL) {
                 throw new Exception("Unrecognized database system " + databaseProductType);
             } else {
-                conn = JDBCTools.getConnection(dataSourceName, repositoryName);
+                String databaseName = JDBCTools.getDatabaseName(repositoryName, cspaceInstanceId);
+                conn = JDBCTools.getConnection(dataSourceName, databaseName);
                 stmt = conn.createStatement();                
                 //sql = "REVOKE SELECT ON ALL TABLES IN SCHEMA public FROM "+readerRoleName;
                 //stmt.execute(sql);