]> git.aero2k.de Git - tmp/jakarta-migration.git/commitdiff
CSPACE-6343: Updated the ReportPostInitHandler to use an instance-qualified database...
authorAron Roberts <aron@socrates.berkeley.edu>
Wed, 19 Mar 2014 00:17:32 +0000 (17:17 -0700)
committerAron Roberts <aron@socrates.berkeley.edu>
Wed, 19 Mar 2014 00:17:32 +0000 (17:17 -0700)
services/report/service/src/main/java/org/collectionspace/services/report/nuxeo/ReportPostInitHandler.java

index f8c2c02012880a1c9261f36518d53350ab817ef2..d2f437503353f5b2ca513de56c8c351280dbbae1 100644 (file)
@@ -83,7 +83,8 @@ public class ReportPostInitHandler extends InitHandler implements IInitHandler {
             } else if(databaseProductType != DatabaseProductType.POSTGRESQL) {\r
                 throw new Exception("Unrecognized database system " + databaseProductType);\r
             } else {\r
-                conn = JDBCTools.getConnection(dataSourceName, repositoryName);\r
+                String databaseName = JDBCTools.getDatabaseName(repositoryName, cspaceInstanceId);\r
+                conn = JDBCTools.getConnection(dataSourceName, databaseName);\r
                 stmt = conn.createStatement();                \r
                 //sql = "REVOKE SELECT ON ALL TABLES IN SCHEMA public FROM "+readerRoleName;\r
                 //stmt.execute(sql);\r