From ab7456bacaabc3e52f126fb0be832f3a52f55e75 Mon Sep 17 00:00:00 2001 From: Aron Roberts Date: Tue, 18 Mar 2014 19:20:45 -0700 Subject: [PATCH] CSPACE-6336: Added all-important semi-colons to end SQL statements in database initialization SQL script. --- .../java/org/collectionspace/services/common/ServiceMain.java | 2 +- .../services/report/nuxeo/ReportPostInitHandler.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) 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 d0c16efb9..ffe58159d 100644 --- 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"); private static final String DROP_DATABASE_SQL_CMD = "DROP DATABASE"; - private static final String DROP_DATABASE_IF_EXISTS_SQL_CMD = DROP_DATABASE_SQL_CMD + " IF EXISTS %s"; + private static final String DROP_DATABASE_IF_EXISTS_SQL_CMD = DROP_DATABASE_SQL_CMD + " IF EXISTS %s;"; private static final String DROP_OBJECTS_SQL_COMMENT = "-- drop all the objects before dropping roles"; 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 d2f437503..d5e6865d3 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 @@ -22,6 +22,7 @@ import java.sql.SQLException; import java.sql.Statement; import java.util.List; +import org.collectionspace.services.common.ServiceMain; import org.collectionspace.services.common.api.Tools; import org.collectionspace.services.common.init.IInitHandler; import org.collectionspace.services.common.init.InitHandler; @@ -49,7 +50,7 @@ public class ReportPostInitHandler extends InitHandler implements IInitHandler { final Logger logger = LoggerFactory.getLogger(ReportPostInitHandler.class); public static final String READ_ROLE_NAME_KEY = "readerRoleName"; - private String readerRoleName = "reader"; + private String readerRoleName = "reader" + ServiceMain.getInstance().getCspaceInstanceId(); /** See the class javadoc for this class: it shows the syntax supported in the configuration params. */ -- 2.47.3