resolves dynamic inclusion.

Author: slowcoders

hyperquery/src/main/java/org/slowcoders/hyperquery/core/QMapperView.java

@@ -3,6 +3,7 @@
 import org.slowcoders.hyperquery.impl.HModel;
 import org.slowcoders.hyperquery.impl.HSchema;
 import org.slowcoders.hyperquery.impl.ViewResolver;
+import org.w3c.dom.Node;
 
 import java.util.Map;
 
@@ -13,7 +14,7 @@ public class QMapperView<R extends QRecord<?>> extends HModel {
     private final String namespace;
     private final String sqlId;
     private final Map<String, String> properties;
-    private String query;
+    private Object query;
 
     public QMapperView(Class<R> recordType, Class<?> mapper, String sqlId) {
         this(recordType, mapper.getName(), sqlId);
@@ -40,7 +41,7 @@ protected HSchema loadSchema() {
     }
 
     @Override
-    protected String getTableExpression(ViewResolver viewResolver) {
+    protected Object getTableExpression(ViewResolver viewResolver) {
         if (query == null) {
             query = viewResolver.resolveView(namespace, sqlId, properties);
         }
@@ -51,4 +52,12 @@ protected String getTableExpression(ViewResolver viewResolver) {
     protected String getTableName() {
         return "";
     }
+
+    public String getMapperId() {
+        return namespace + '.' + sqlId;
+    }
+
+    public final Map<String, String> getProperties() {
+        return properties;
+    }
 }

hyperquery/src/main/java/org/slowcoders/hyperquery/impl/HModel.java

@@ -17,7 +17,7 @@ public void initialize() {
 
     protected abstract String getTableName();
 
-    protected String getTableExpression(ViewResolver viewResolver) { return null;}
+    protected Object getTableExpression(ViewResolver viewResolver) { return ""; }
 
     protected QAttribute getAttribute(String property) {
         return null;

hyperquery/src/main/java/org/slowcoders/hyperquery/impl/HQuery.java

@@ -0,0 +1,13 @@
+package org.slowcoders.hyperquery.impl;
+
+import org.apache.ibatis.parsing.XNode;
+
+public class HQuery {
+    XNode with;
+    String query;
+
+    public HQuery(XNode rootSqlNode, String sql) {
+        this.query = sql;
+        this.with = rootSqlNode;
+    }
+}

hyperquery/src/main/java/org/slowcoders/hyperquery/impl/QStore.java

@@ -4,14 +4,13 @@
 import org.apache.ibatis.builder.xml.XMLIncludeTransformer;
 import org.apache.ibatis.mapping.*;
 import org.apache.ibatis.parsing.GenericTokenParser;
-import org.apache.ibatis.parsing.TokenHandler;
 import org.apache.ibatis.parsing.XNode;
-import org.apache.ibatis.scripting.defaults.RawSqlSource;
 import org.apache.ibatis.scripting.xmltags.*;
 import org.apache.ibatis.session.Configuration;
-import org.apache.ibatis.type.SimpleTypeRegistry;
 import org.mybatis.spring.SqlSessionTemplate;
 import org.slowcoders.hyperquery.core.*;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 
@@ -39,11 +38,11 @@ public <E extends QEntity<E>, R extends QRecord<E>> R selectOne(Class<R> resultT
 
     public <E extends QEntity<E>, R extends QRecord<E>> List<R> selectList(HModel view, Class<R> resultType, QFilter<E> filter) {
         SqlBuilder gen = new SqlBuilder(view, resultType, filter, this);
-        String sql = gen.build();
+        HQuery node = gen.build();
 
-        String id = registerMapper(null, gen.getRootSchema(), resultType);
+        String id = registerMapper(node.with, resultType);
 
-        HFilter._sql.set(sql);
+        HFilter._sql.set(node.query);
         HFilter._session.set(getCurrentSessionInfo());
 
         Object res = sqlSessionTemplate.selectList(id, filter);
@@ -96,17 +95,25 @@ private ResultMap createNestedResultMap(Class<?> clazz, String resultMapId, Stri
         return new ResultMap.Builder(configuration, resultMapId, clazz, resultMappings, true).build();
     }
 
-    String registerMapper(SqlSource sqlSource, HModel relation, Class<?> resultType) {
+    String registerMapper(XNode sqlNode, Class<?> resultType) {
         String id = repositoryType.getName() + ".__select__." + resultType.getName();
 
         if (!configuration.hasStatement(id)) {
-            ResultMap inlineResultMap = createNestedResultMap(resultType, id + "-Inline", ""); 
-            List<ResultMap> __resultMaps = new ArrayList<>();
-            __resultMaps.add(inlineResultMap);
 
             String root_id = repositoryType.getName() + ".__select__";
             MappedStatement root_ms = configuration.getMappedStatement(root_id);
-            if (sqlSource == null) sqlSource = root_ms.getSqlSource();
+
+            SqlSource sqlSource;
+            if (sqlNode == null) {
+                sqlSource = root_ms.getSqlSource();
+            } else {
+                sqlSource = new XMLScriptBuilder(configuration, sqlNode).parseScriptNode();
+            }
+
+            ResultMap inlineResultMap = createNestedResultMap(resultType, id + "-Inline", "");
+            List<ResultMap> __resultMaps = new ArrayList<>();
+            __resultMaps.add(inlineResultMap);
+
             MappedStatement.Builder builder = new MappedStatement.Builder(configuration, id, sqlSource, root_ms.getSqlCommandType())
                     .resource(root_ms.getResource())
                     .fetchSize(root_ms.getFetchSize())
@@ -132,7 +139,7 @@ String registerMapper(SqlSource sqlSource, HModel relation, Class<?> resultType)
         return id;
     }
 
-    public String resolveView(String namespace, String sqlFragmentId, Map<String, String> properties) {
+    public Object resolveView(String namespace, String sqlFragmentId, Map<String, String> properties) {
         String mapperId = namespace + "." + sqlFragmentId;
         if (configuration.hasStatement(mapperId)) {
             throw new IllegalArgumentException("Only <sql> fragments can be used to create View.");
@@ -143,9 +150,46 @@ public String resolveView(String namespace, String sqlFragmentId, Map<String, St
         builderAssistant.setCurrentNamespace(namespace);
         XMLIncludeTransformer includeParser = new XMLIncludeTransformer(configuration, builderAssistant);
         XNode fr = configuration.getSqlFragments().get(mapperId);
-        includeParser.applyIncludes(fr.getNode());
-        if (!checkValidXmlQuery(fr.getNode())) {
-            throw new IllegalArgumentException("View expression should not contain conditional expression like <if>, <choose>, <foreach>. But current is \n" + fr.toString());
+        if (fr == null) {
+            throw new IllegalArgumentException("<sql> fragments is not found. " + mapperId);
+        }
+
+        Document doc = fr.getNode().getOwnerDocument();
+        Element include = doc.createElement("include");
+        include.setAttribute("refid", mapperId);
+        for (Map.Entry<String, String> entry : properties.entrySet()) {
+            Element property = doc.createElement("property");
+            property.setAttribute("name", entry.getKey());
+            property.setAttribute("value", entry.getValue());
+            include.appendChild(property);
+        }
+        Element sqlNode = doc.createElement("sql");
+        include.setAttribute("id", mapperId + "-sql");
+        sqlNode.appendChild(include);
+
+
+        includeParser.applyIncludes(sqlNode);
+        if (!checkValidXmlQuery(sqlNode)) {
+            return sqlNode;
+//            GenericTokenParser tokenReplacer1 = new GenericTokenParser("#{", "}", properties::get);
+//            GenericTokenParser tokenReplacer2 = new GenericTokenParser("${", "}", properties::get);
+//            Node child = ((Node)fr.getNode()).getFirstChild();
+//            for (; child != null; child = child.getNextSibling()) {
+//                if (child.getNodeType() == Node.TEXT_NODE) {
+//                    String text = tokenReplacer1.parse(child.getTextContent());
+//                    text = tokenReplacer2.parse(text);
+//                    child.setTextContent(text);
+//                }
+//            }
+//            return fr.getNode();
+//            throw new IllegalArgumentException("View expression should not contain conditional expression like <if>, <choose>, <foreach>. But current is \n" + fr.toString());
+        }
+
+        if (false) {
+            // BoundSql bsql = sqlSource.getBoundSql(mapperParams);
+            mapperId = registerMapper(fr, /*resultType*/null);
+            Object res = sqlSessionTemplate.selectList(mapperId, /*mapperParams*/null);
+            //System.out.println(res);
         }
 
         String sql = fr.getNode().getTextContent();
@@ -160,7 +204,8 @@ private boolean checkValidXmlQuery(Node node) {
         }
         NodeList children = node.getChildNodes();
         for (int i = 0; i < children.getLength(); i++) {
-            checkValidXmlQuery(children.item(i));
+            if (!checkValidXmlQuery(children.item(i)))
+                return false;
         }
         return true;
     }

hyperquery/src/main/java/org/slowcoders/hyperquery/impl/SqlBuilder.java

@@ -1,7 +1,11 @@
 package org.slowcoders.hyperquery.impl;
 
+import org.apache.ibatis.parsing.GenericTokenParser;
+import org.apache.ibatis.parsing.XNode;
+import org.apache.ibatis.parsing.XPathParser;
 import org.slowcoders.hyperquery.core.*;
 import org.slowcoders.hyperquery.util.SqlWriter;
+import org.w3c.dom.Node;
 
 import java.lang.reflect.Field;
 import java.util.*;
@@ -18,6 +22,25 @@ public class SqlBuilder extends ViewNode {
     private ViewNode currView = this;
     private JoinNode currNode;
 
+    private SqlWriter sbWith = new SqlWriter().write("WITH ");
+    private SqlWriter sbQuery = new SqlWriter();
+
+    private XPathParser xpathParser;
+
+    private final Node rootNode;
+    private final XNode rootSqlNode;
+
+    private static final String emptyXml = """
+    <?xml version="1.0" encoding="UTF-8" ?>
+    <sql/>""";
+
+    static String ss = """
+                <!DOCTYPE mapper
+            PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+            "https://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+            """;
+
     public <R extends QRecord<E>, E extends QEntity<E>> SqlBuilder(HModel schema, Class<R> resultType, QFilter<E> filter, ViewResolver viewResolver ) {
         this.rootSchema = schema;
         this.resultType = resultType;
@@ -27,34 +50,49 @@ public <R extends QRecord<E>, E extends QEntity<E>> SqlBuilder(HModel schema, Cl
         if (filter != null && HSchema.getSchema(filter.getClass(), false) != this.rootSchema.loadSchema()) {
             throw new IllegalArgumentException("Filter type is not related to result type.");
         }
+        this.xpathParser = new XPathParser(emptyXml);
+        this.rootSqlNode = xpathParser.evalNode("/sql");
+        this.rootNode = rootSqlNode.getNode();
     }
 
     public final HModel getRootSchema() {
         return rootSchema;
     }
 
-    public String build() {
+    public HQuery build() {
         List<ColumnMapping> columnMappings = parseSelect(rootSchema, resultType, "");
         QCriteria criteria = QCriteria.parse(this, filter, "@");
 
         String where = criteria.toString();
-        SqlWriter sbWith = new SqlWriter().write("WITH ");
-        SqlWriter sb = new SqlWriter();
 
-        genTableView(sbWith, "t_0", currNode);
-        genSelections(sb);
+        genTableView("t_0", currNode);
+        genSelections();
         String baseTable = currNode.views.isEmpty() ? rootSchema.getTableName() : "";
-        sb.write("from ").write(baseTable).write(" t_0").write('\n');
-        genJoin(sb, sbWith, currView.joins);
-        if (sbWith.length() > 5) {
+        sbQuery.write("from ").write(baseTable).write(" t_0").write('\n');
+        genJoin(currView.joins);
+
+        boolean needMapper = rootNode.hasChildNodes();
+        if (sbWith.length() > 5 || needMapper) {
             sbWith.shrinkLength(2);
             sbWith.writeln();
-            sbWith.write(sb.toString());
-            sb = sbWith;
+            if (needMapper) {
+                sbWith.write("${__sql__}");
+                addTextNode(sbWith.reset());
+            } else {
+                sbWith.write(sbQuery.reset());
+                sbQuery = sbWith;
+            }
         }
-        sb.write("WHERE ").write(where);
-        String sql = sb.toString();
-        return sql;
+
+        sbQuery.write("WHERE ").write(where);
+        String sql = sbQuery.toString();
+//        return sql;
+        return new HQuery(needMapper ? rootSqlNode : null, sql);
+    }
+
+    void addTextNode(String s) {
+        Node text = rootNode.getOwnerDocument().createTextNode(s);
+        rootNode.appendChild(text);
     }
 
 
@@ -143,58 +181,70 @@ private <T> T resolveQualifiedAlias(String path, IdentifierHandler<T> handler) {
         return res;
     }
 
-    private void genSelections(SqlWriter sb) {
-        sb.write("SELECT ");
-        sb.incTab();
+    private void genSelections() {
+        sbQuery.write("SELECT ");
+        sbQuery.incTab();
         for (ColumnMapping col : columnMappings) {
-            sb.write(col.columnName).write(" as \"").write(col.fieldName).write("\",\n");
+            sbQuery.write(col.columnName).write(" as \"").write(col.fieldName).write("\",\n");
         }
-        sb.shrinkLength(2);
-        sb.decTab();
-        sb.write('\n');
+        sbQuery.shrinkLength(2);
+        sbQuery.decTab();
+        sbQuery.write('\n');
     }
 
 
-    private void genJoin(SqlWriter sb, SqlWriter sbWith, Map<String, JoinNode> joinNodes) {
+    private void genJoin(Map<String, JoinNode> joinNodes) {
         for (Map.Entry<String, JoinNode> entry : joinNodes.entrySet()) {
             String alias = entry.getKey();
             JoinNode node = entry.getValue();
-            String tableName = genTableView(sbWith, alias, node);
-            sb.write("left join ").write(tableName).write(" ").write(alias);
-            sb.write("\n on ").write(node.joinCriteria).write('\n');
+            String tableName = genTableView(alias, node);
+            sbQuery.write("left join ").write(tableName).write(" ").write(alias);
+            sbQuery.write("\n on ").write(node.joinCriteria).write('\n');
         }
     }
 
-    private String genTableView(SqlWriter sb, String alias, JoinNode node) {
+    private String genTableView(String alias, JoinNode node) {
         String tableName = node.model.getTableName();
         if (tableName.isEmpty()) {
-            sb.write(alias).write(" AS (\n");
-            sb.incTab();
-            sb.write(node.model.getTableExpression(viewResolver));
-            sb.decTab();
-            sb.write("), ");
+            sbWith.write(alias).write(" AS (\n");
+            sbWith.incTab();
+            Object expr = node.model.getTableExpression(viewResolver);
+            if (expr instanceof Node) {
+                if (sbWith.length() > 0) {
+                    addTextNode(sbWith.reset());
+                }
+                Node child = ((Node)expr).getFirstChild();
+                for (; child != null; child = child.getNextSibling()) {
+                    Node newChild = rootNode.getOwnerDocument().importNode(child, true);
+                    rootNode.appendChild(newChild);
+                }
+            } else {
+                sbWith.write(expr.toString());
+            }
+            sbWith.decTab();
+            sbWith.write("), ");
             return tableName;
         }
 
         if (node.views.isEmpty()) return tableName;
 
         for (int idx = node.views.size(); --idx >= 0;) {
             ViewNode attrMap = node.views.get(idx);
-            sb.write(alias);
-            if (idx > 0) sb.write('_').write(idx);
-            sb.write(" AS (\n");
-            sb.write("SELECT ").write(alias).write(".*");
-            sb.incTab();
+            sbWith.write(alias);
+            if (idx > 0) sbWith.write('_').write(idx);
+            sbWith.write(" AS (\n");
+            sbWith.write("SELECT ").write(alias).write(".*");
+            sbWith.incTab();
             for (Map.Entry<String, String> attr : attrMap.usedAttributes.entrySet()) {
                 String name = attr.getKey();
                 String expr = attr.getValue();
-                sb.write("\n, ").write(expr).write(" as ").write(name);
+                sbWith.write("\n, ").write(expr).write(" as ").write(name);
             }
-            sb.decTab();
-            sb.write("\nFROM ").write(tableName);
-            sb.write(" AS ").write(alias).write("\n");
-            genJoin(sb, null, attrMap.joins);
-            sb.write("\n), ");
+            sbWith.decTab();
+            sbWith.write("\nFROM ").write(tableName);
+            sbWith.write(" AS ").write(alias).write("\n");
+            genJoin(attrMap.joins);
+            sbWith.write("\n), ");
             tableName = alias + '_' + (idx);
         }
         return "";