Multibuild working

src/libs/app.js

@@ -44,6 +44,18 @@ app.use((req, res, next) => {
         };
     };
     req.resetSql();
+
+    req.sql.oldClone = req.sql.clone;
+    req.sql.clone = () => {
+        let cloned = req.sql.oldClone();
+        cloned.oldFrom = cloned.from;
+        cloned.from = (name, alias = null) => {
+            cloned.oldFrom(name, alias || null);
+            cloned.tableFrom = name;
+            return cloned;
+        };
+        return cloned;
+    };
     next();
 });
 app.use(passport.initialize());

src/libs/middlewares/reqQueryFields.js

@@ -325,6 +325,8 @@ class ReqQueryFields {
     multibuild() {
         return (req, res, next) => {
             req.querySet.forEach((query) => {
+                console.log("query");
+                console.log(query.tableFrom);
                 query = this.buildQuery(req, query);
             });
             next();

src/libs/routes/siope.js

@@ -22,8 +22,6 @@ const config = require(`${libs}/config`);
 
 const cache = require('apicache').options({ debug: config.debug, statusCodes: {include: [200]} }).middleware;
 
-const matchQueries = require(`${libs}/middlewares/matchQueries`);
-
 let rqf = new ReqQueryFields();
 
 siopeApp.use(cache('15 day'));
@@ -112,7 +110,7 @@ rqf.addField({
 
 
 
-siopeApp.get('/', rqf.parse(), rqf.build(), (req, res, next) => {
+siopeApp.get('/', rqf.parse(), (req, res, next) => {
     req.querySet = [];
     req.queryIndex = {};
 
@@ -149,7 +147,7 @@ siopeApp.get('/', rqf.parse(), rqf.build(), (req, res, next) => {
     req.queryIndex.siopeMun = req.querySet.push(siopeMun) - 1;
 
     next();
-}, multiQuery, (req, res, next) => {
+}, rqf.multibuild(), multiQuery, (req, res, next) => {
 
     let result = {}
     if ('state' in req.filter) {
@@ -164,6 +162,6 @@ siopeApp.get('/', rqf.parse(), rqf.build(), (req, res, next) => {
     req.result = result;
     next();
 
-}, id2str.transform(), response('siope'));
+}, response('siope'));
 
 module.exports = siopeApp;