#266 - where now added to sql template

9tigerio · Feb 11, 2024 · a408e65 · a408e65
1 parent 94d0d00
commit a408e65
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 7 deletions.
diff --git a/src/main/java/com/homihq/db2rest/rest/read/dto/ReadContextV2.java b/src/main/java/com/homihq/db2rest/rest/read/dto/ReadContextV2.java
@@ -13,6 +13,7 @@
 import org.mybatis.dynamic.sql.SqlCriterion;
 
 import java.util.List;
+import java.util.Map;
 
 @Builder
 @AllArgsConstructor
@@ -40,8 +41,8 @@ public class ReadContextV2 {
     /* Attributes to replace the ones above */
     DbTable root;
     List<DbColumn> cols;
-
-
+    String rootWhere;
+    Map<String,Object> paramMap;
 
     public void addWhereCondition(SqlCriterion whereCondition) {
         this.whereCondition = whereCondition;

diff --git a/src/main/java/com/homihq/db2rest/rest/read/processor/QueryCreatorTemplate.java b/src/main/java/com/homihq/db2rest/rest/read/processor/QueryCreatorTemplate.java
@@ -30,9 +30,10 @@ public void createQuery(ReadContextV2 readContextV2) {
 
         log.info("**** Preparing to render ****");
 
-        Map data = new HashMap();
+        Map<String,Object> data = new HashMap<>();
         data.put("columns", readContextV2.getCols());
         data.put("rootTable", readContextV2.getRoot());
+        data.put("rootWhere", readContextV2.getRootWhere());
         sqlRenderer.render("read", data);
 
 

diff --git a/src/main/java/com/homihq/db2rest/rest/read/processor/pre/RootWhereProcessor.java b/src/main/java/com/homihq/db2rest/rest/read/processor/pre/RootWhereProcessor.java
@@ -41,7 +41,8 @@ public void process(ReadContextV2 readContextV2) {
 
             log.info("param map - {}", paramMap);
 
-            //readContextV2.addWhereCondition(condition);
+            readContextV2.setRootWhere(where);
+            readContextV2.setParamMap(paramMap);
 
         }
     }

diff --git a/src/main/resources/sql-templates/read.sql b/src/main/resources/sql-templates/read.sql
@@ -1,7 +1,8 @@
 SELECT
     [# th:each="column : ${columns}"]
-    [(${column.name})]
-    [/]
+    [(${column.name})][/]
 FROM
     [(${rootTable.name})]
-
+[# th:if="${rootWhere}"]WHERE
+    [(${rootWhere})]
+[/]