X-Git-Url: https://gerrit.onap.org/r/gitweb?p=dmaap%2Fdbcapi.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fonap%2Fdmaap%2Fdbcapi%2Fdatabase%2FLoadSchema.java;h=2a7925bcc7a8d2b667f8a249ebbf68a5a2065923;hp=6e64c4a1edf4d5391ad742299ab9896b53770671;hb=f283c8d30ab3e5cde52906bc41c368f07733bb81;hpb=1c6b5fa580c9b82e17b710dbc4cf9bbce57eb5bc

diff --git a/src/main/java/org/onap/dmaap/dbcapi/database/LoadSchema.java b/src/main/java/org/onap/dmaap/dbcapi/database/LoadSchema.java
index 6e64c4a..2a7925b 100644
--- a/src/main/java/org/onap/dmaap/dbcapi/database/LoadSchema.java
+++ b/src/main/java/org/onap/dmaap/dbcapi/database/LoadSchema.java
@@ -55,7 +55,7 @@ public class LoadSchema	{
 		Connection c = null;
 		Statement stmt = null;
 		InputStream is = null;
-		try {
+		try { 
 			c = cf.get(true);
 			stmt = c.createStatement();
 			int newver = -1;
@@ -63,11 +63,17 @@ public class LoadSchema	{
 				newver = getVer(stmt);
 			} catch (Exception e) {}
 			logger.info("Database schema currently at version " + newver++);
+
 			while ((is = LoadSchema.class.getClassLoader().getResourceAsStream("schema_" + newver + ".sql")) != null) {
 				logger.info("Upgrading database schema to version " + newver);
 				BufferedReader br = new BufferedReader(new InputStreamReader(is));
 				String s;
-				String sofar = null;
+				String sofar;
+				if ( newver > 0 ) {
+					sofar = null;
+				} else {
+					sofar = String.format( "SET search_path to %s;", cf.getSchema());
+				}
 				while ((s = br.readLine()) != null) {
 					logger.info("SCHEMA: " + s);
 					s = s.trim();