Resolved bug of sql queries picking up global credentials datastore when query specific credentials were specified

Author: sanketsarang

.idea/workspace.xml

@@ -324,7 +324,7 @@ public static <T extends Db> Object execute(final Credentials credentials, final
             throw new InternalAdapterException("No collection name set. Table name is a mandatory field queries.");
         }
 
-        final String queryStr = query.asSql();
+        final String queryStr = query.asSql(credentials.getDb());
 
         final DbQueryResponse response = QueryExecuter.executeSql(DbQueryRequest.create(credentials, queryStr));
 

src/main/java/com/blobcity/db/Db.java

@@ -50,6 +50,11 @@ public String asSql() {
         return columnName + " " + order;
     }
 
+    @Override
+    public String asSql(final String ds) {
+        throw new RuntimeException("Incorrect invocation. Sqlable.asSql(ds) should not be invoked by OrderElement class");
+    }
+
     @Override
     protected OrderElement clone() {
         return new OrderElement(columnName, order);

src/main/java/com/blobcity/db/search/OrderElement.java

@@ -59,4 +59,9 @@ private ParamOperator(final String sqlText) {
     public String asSql() {
         return sqlText == null ? name() : sqlText;
     }
+
+    @Override
+    public String asSql(final String ds) {
+        throw new RuntimeException("Incorrect invocation. Sqlable.asSql(ds) should not be invoked by ParamOperator class");
+    }
 }

src/main/java/com/blobcity/db/search/ParamOperator.java

@@ -212,6 +212,11 @@ public JsonObject asJson() {
 
     @Override
     public String asSql() {
+        throw new RuntimeException("Incorrect invocation. Sqlable.asSql() should not be invoked by Query class");
+    }
+
+    @Override
+    public String asSql(final String ds) {
         final StringBuffer sb = new StringBuffer();
         sb.append("SELECT ").append(StringUtil.join(selectColumnNames, ", ", "*", "`"));
 
@@ -228,9 +233,9 @@ public String asSql() {
         final int fromTableCount = binaryClassNames ? fromTables.size() : fromTablesString.size();
         for (int i = 0; i < fromTableCount; i++) {
             if(binaryClassNames) {
-                sb.append('`').append(Db.getDs(fromTables.get(i))).append("`.`").append(Db.getCollection(fromTables.get(i)));
+                sb.append('`').append(ds).append("`.`").append(Db.getCollection(fromTables.get(i)));
             }else{
-                sb.append('`').append(Db.getDs()).append("`.`").append(fromTablesString.get(i));
+                sb.append('`').append(ds).append("`.`").append(fromTablesString.get(i));
             }
 
             if (i < fromTableCount - 1) {

src/main/java/com/blobcity/db/search/Query.java

@@ -254,6 +254,11 @@ public String asSql() {
         return sb.toString();
     }
 
+    @Override
+    public String asSql(final String ds) {
+        throw new RuntimeException("Incorrect invocation. Sqlable.asSql(ds) should not be invoked by SearchParam class");
+    }
+
     /**
      * Method is internally called whenever the {@link #condition} and/or {@link #args} are updated.
      *

src/main/java/com/blobcity/db/search/SearchParam.java

@@ -12,13 +12,23 @@
  *
  * @see Jsonable
  * @author Karun AB
+ * @author Sanket Sarang
  */
 interface Sqlable {
 
     /**
      * Provides a legal SQL form of the implementing class
      *
-     * @return instance of a legal SQL format as a {@link String}
+     * @return instance of a legal SQL format as a (@link String}
      */
+
     public String asSql();
+
+    /**
+     * Provides a legal SQL form of the implementing class with the generated SQL being for the specified datastore
+     *
+     * @param ds name of datastore
+     * @return instance of a legal SQL format as a {@link String}
+     */
+    public String asSql(final String ds);
 }