CSPACE-6336: Added all-important semi-colons to end SQL statements in database initia...

diff --git a/services/common/src/main/java/org/collectionspace/services/common/ServiceMain.java b/services/common/src/main/java/org/collectionspace/services/common/ServiceMain.java
index d0c16efb941cbf2200ba21ec089954d40deb7673..ffe58159dd46084269c78c5f6c4fa1c741be0f86 100644 (file)
--- a/services/common/src/main/java/org/collectionspace/services/common/ServiceMain.java
+++ b/services/common/src/main/java/org/collectionspace/services/common/ServiceMain.java
@@ -81,7 +81,7 @@ public class ServiceMain {
             String.format(COMPONENT_EXTENSION_XPATH, "repositories");\r
     \r
     private static final String DROP_DATABASE_SQL_CMD = "DROP DATABASE";\r
-    private static final String DROP_DATABASE_IF_EXISTS_SQL_CMD = DROP_DATABASE_SQL_CMD + " IF EXISTS %s";\r
+    private static final String DROP_DATABASE_IF_EXISTS_SQL_CMD = DROP_DATABASE_SQL_CMD + " IF EXISTS %s;";\r
     private static final String DROP_OBJECTS_SQL_COMMENT = "-- drop all the objects before dropping roles";\r
 \r
             \r

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 d2f437503353f5b2ca513de56c8c351280dbbae1..d5e6865d316914264104fe01769a07361ac26fc6 100644 (file)
--- 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
@@ -22,6 +22,7 @@ import java.sql.SQLException;
 import java.sql.Statement;\r
 import java.util.List;\r
 \r
+import org.collectionspace.services.common.ServiceMain;\r
 import org.collectionspace.services.common.api.Tools;\r
 import org.collectionspace.services.common.init.IInitHandler;\r
 import org.collectionspace.services.common.init.InitHandler;\r
@@ -49,7 +50,7 @@ public class ReportPostInitHandler extends InitHandler implements IInitHandler {
 \r
     final Logger logger = LoggerFactory.getLogger(ReportPostInitHandler.class);\r
     public static final String READ_ROLE_NAME_KEY = "readerRoleName";\r
-    private String readerRoleName = "reader";\r
+    private String readerRoleName = "reader" + ServiceMain.getInstance().getCspaceInstanceId();\r
 \r
     /** See the class javadoc for this class: it shows the syntax supported in the configuration params.\r
      */\r