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%2FTableHandler.java;h=66539ed56c0aaa6e4de30dae2584f441af794552;hp=b43edc5ef0c0bfd1889ee738fa1843f76b3250b9;hb=f283c8d30ab3e5cde52906bc41c368f07733bb81;hpb=1c6b5fa580c9b82e17b710dbc4cf9bbce57eb5bc

diff --git a/src/main/java/org/onap/dmaap/dbcapi/database/TableHandler.java b/src/main/java/org/onap/dmaap/dbcapi/database/TableHandler.java
index b43edc5..66539ed 100644
--- a/src/main/java/org/onap/dmaap/dbcapi/database/TableHandler.java
+++ b/src/main/java/org/onap/dmaap/dbcapi/database/TableHandler.java
@@ -68,7 +68,8 @@ class TableHandler<C>	{
 	private void setup(DatabaseMetaData dmd, Class<C> cls, String tabname, String keyname) throws Exception {
 		this.cls = cls;
 		Vector<DBFieldHandler> h = new Vector<DBFieldHandler>();
-		ResultSet rs = dmd.getColumns("", "public", tabname, null);
+		String qualifiedTableName = String.format( "%s.%s", cf.getSchema(), tabname );
+		ResultSet rs = dmd.getColumns("", cf.getSchema(), tabname, null);
 		StringBuffer sb1 = new StringBuffer();
 		StringBuffer sb2 = new StringBuffer();
 		StringBuffer sb3 = new StringBuffer();
@@ -100,15 +101,15 @@ class TableHandler<C>	{
 		if (haskey) {
 			count++;
 			h.add(new DBFieldHandler(cls, keyname, count, getSpecialCase(tabname, keyname)));
-			delstmt = "DELETE FROM " + tabname + " WHERE " + keyname + " = ?";
-			insorreplstmt = "INSERT INTO " + tabname + " (" + clist + ", " + keyname + ") VALUES (" + qlist + ", ?) ON CONFLICT(" + keyname + ") DO UPDATE SET (" + clist + ") = (" + elist + ")";
-			getstmt = "SELECT " + clist + ", " + keyname + " FROM " + tabname + " WHERE " + keyname + " = ?";
-			liststmt = "SELECT " + clist + ", " + keyname + " FROM " + tabname;
+			delstmt = "DELETE FROM " + qualifiedTableName + " WHERE " + keyname + " = ?";
+			insorreplstmt = "INSERT INTO " + qualifiedTableName + " (" + clist + ", " + keyname + ") VALUES (" + qlist + ", ?) ON CONFLICT(" + keyname + ") DO UPDATE SET (" + clist + ") = (" + elist + ")";
+			getstmt = "SELECT " + clist + ", " + keyname + " FROM " + qualifiedTableName + " WHERE " + keyname + " = ?";
+			liststmt = "SELECT " + clist + ", " + keyname + " FROM " + qualifiedTableName;
 		} else {
-			delstmt = "DELETE FROM " + tabname;
-			initstmt = "INSERT INTO " + tabname + " (" + clist + ") VALUES (" + qlist + ")";
-			insorreplstmt = "UPDATE " + tabname + " SET (" + clist + ") = (" + qlist + ")";
-			getstmt = "SELECT " + clist + ", " + keyname + " FROM " + tabname;
+			delstmt = "DELETE FROM " + qualifiedTableName;
+			initstmt = "INSERT INTO " + qualifiedTableName + " (" + clist + ") VALUES (" + qlist + ")";
+			insorreplstmt = "UPDATE " + qualifiedTableName + " SET (" + clist + ") = (" + qlist + ")";
+			getstmt = "SELECT " + clist + ", " + keyname + " FROM " + qualifiedTableName;
 		}
 		fields = h.toArray(new DBFieldHandler[h.size()]);
 	}