@saltcorn/sql 0.5.3 → 0.5.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@saltcorn/sql",
-  "version": "0.5.3",
+  "version": "0.5.4",
   "description": "Actions and views based on SQL",
   "main": "index.js",
   "dependencies": {

package/table-provider.js

@@ -163,22 +163,7 @@ const sqlEscapeObject = (o) => {
   return r;
 };
 
-const runQuery = async (cfg, where, opts) => {
-  const sqlTmpl = cfg?.sql || "";
-  const template = _.template(sqlTmpl || "", {
-    evaluate: /\{\{#(.+?)\}\}/g,
-    interpolate: /\{\{([^#].+?)\}\}/g,
-  });
-
-  const qctx = {};
-
-  if (opts?.forUser) qctx.user = sqlEscapeObject(opts.forUser);
-  else if (where?.forUser)
-    qctx.user = sqlEscapeObject(where.forUser); //workaround legacy bug
-  else qctx.user = null;
-
-  const sql = template(qctx);
-
+const getSqlQuery = (sql, cfg, where, opts) => {
   const is_sqlite = db.isSQLite;
   const opt = {
     database: is_sqlite ? "SQLite" : "PostgreSQL",
@@ -189,12 +174,21 @@ const runQuery = async (cfg, where, opts) => {
     sqlQ = sql;
   } else {
     const { ast } = parser.parse(sql, opt);
-
+    /*console.log(
+      JSON.stringify(
+        parser.parse(
+          `select * from "users" where "email" ILIKE concat('%',cast($1 as text),'%')`,
+          opt
+        ).ast,
+        null,
+        2
+      )
+    );*/
     const colNames = new Set((cfg?.columns || []).map((c) => c.name));
     let phIndex = 1;
     //console.log(ast[0].columns);
-    for (const k of Object.keys(where)) {
-      if (!colNames.has(k)) continue;
+    const proc_k_where = (k, wherek) => {
+      if (!colNames.has(k)) return;
       const sqlCol =
         ast[0].columns == "*"
           ? {
@@ -240,14 +234,66 @@ const runQuery = async (cfg, where, opts) => {
             column: db.sqlsanitize(k),
           };
       }
+
       const newClause = {
         type: "binary_expr",
-        operator: where[k]?.ilike && !sqlAggrCol ? "ILIKE" : "=",
+        operator:
+          wherek?.ilike && !sqlAggrCol
+            ? "ILIKE"
+            : wherek?.gt && !sqlAggrCol
+            ? wherek.equal
+              ? ">="
+              : ">"
+            : wherek?.lt && !sqlAggrCol
+            ? wherek.equal
+              ? "<="
+              : "<"
+            : "=",
         left,
-        right: { type: "number", value: "$" + phIndex },
+        right:
+          wherek?.ilike && !sqlAggrCol
+            ? {
+                type: "function",
+                name: {
+                  name: [
+                    {
+                      type: "default",
+                      value: "concat",
+                    },
+                  ],
+                },
+                args: {
+                  type: "expr_list",
+                  value: [
+                    {
+                      type: "single_quote_string",
+                      value: "%",
+                    },
+                    {
+                      type: "cast",
+                      keyword: "cast",
+                      expr: { type: "number", value: "$" + phIndex },
+                      symbol: "as",
+                      target: [
+                        {
+                          dataType: "TEXT",
+                        },
+                      ],
+                    },
+
+                    {
+                      type: "single_quote_string",
+                      value: "%",
+                    },
+                  ],
+                },
+              }
+            : { type: "number", value: "$" + phIndex },
       };
       phIndex += 1;
-      phValues.push(where[k]?.ilike ? where[k]?.ilike : where[k]);
+      phValues.push(
+        wherek?.ilike || wherek?.gt || wherek?.lt || wherek
+      );
       if (!sqlAggrCol) {
         if (!ast[0].where) ast[0].where = newClause;
         else {
@@ -269,6 +315,10 @@ const runQuery = async (cfg, where, opts) => {
           };
         }
       }
+    };
+    for (const k of Object.keys(where)) {
+      if (Array.isArray(where[k])) where[k].forEach((w) => proc_k_where(k, w));
+      else proc_k_where(k, where[k]);
     }
     if (where?.limit && where?.offset) {
       ast[0].limit = {
@@ -346,6 +396,28 @@ const runQuery = async (cfg, where, opts) => {
     }
     sqlQ = parser.sqlify(ast, opt);
   }
+  return { sqlQ, phValues };
+};
+
+const runQuery = async (cfg, where, opts) => {
+  const sqlTmpl = cfg?.sql || "";
+  const template = _.template(sqlTmpl || "", {
+    evaluate: /\{\{#(.+?)\}\}/g,
+    interpolate: /\{\{([^#].+?)\}\}/g,
+  });
+
+  const qctx = {};
+
+  if (opts?.forUser) qctx.user = sqlEscapeObject(opts.forUser);
+  else if (where?.forUser)
+    qctx.user = sqlEscapeObject(where.forUser); //workaround legacy bug
+  else qctx.user = null;
+
+  const sql = template(qctx);
+  const is_sqlite = db.isSQLite;
+
+  const { sqlQ, phValues } = getSqlQuery(sql, cfg, where, opts);
+
   const client = is_sqlite ? db : await db.getClient();
   await client.query(`BEGIN;`);
   if (!is_sqlite) {
@@ -353,7 +425,7 @@ const runQuery = async (cfg, where, opts) => {
     await client.query(`SET SESSION CHARACTERISTICS AS TRANSACTION READ ONLY;`);
   }
 
-  //console.log({ sqlQ, phValues, opts });
+  //console.trace({ sqlQ, phValues, opts });
   const qres = await client.query(sqlQ, phValues);
   qres.query = sqlQ;
   await client.query(`ROLLBACK;`);
@@ -362,6 +434,41 @@ const runQuery = async (cfg, where, opts) => {
   return qres;
 };
 
+const countRows = async (cfg, where, opts) => {
+  const sqlTmpl = cfg?.sql || "";
+  const template = _.template(sqlTmpl || "", {
+    evaluate: /\{\{#(.+?)\}\}/g,
+    interpolate: /\{\{([^#].+?)\}\}/g,
+  });
+
+  const qctx = {};
+
+  if (opts?.forUser) qctx.user = sqlEscapeObject(opts.forUser);
+  else if (where?.forUser)
+    qctx.user = sqlEscapeObject(where.forUser); //workaround legacy bug
+  else qctx.user = null;
+
+  const sql = template(qctx);
+  const is_sqlite = db.isSQLite;
+
+  const { sqlQ, phValues } = getSqlQuery(sql, cfg, where, opts);
+
+  const client = is_sqlite ? db : await db.getClient();
+  await client.query(`BEGIN;`);
+  if (!is_sqlite) {
+    await client.query(`SET LOCAL search_path TO "${db.getTenantSchema()}";`);
+    await client.query(`SET SESSION CHARACTERISTICS AS TRANSACTION READ ONLY;`);
+  }
+
+  //console.trace({ sqlQ, phValues, opts });
+  const qres = await client.query(`select count(*) from (${sqlQ})`, phValues);
+  qres.query = sqlQ;
+  await client.query(`ROLLBACK;`);
+
+  if (!is_sqlite) client.release(true);
+  return qres.rows[0].count;
+};
+
 module.exports = {
   "SQL query": {
     configuration_workflow,
@@ -372,6 +479,9 @@ module.exports = {
           const qres = await runQuery(cfg, where, opts);
           return qres.rows;
         },
+        countRows: async (where, opts) => {
+          return await countRows(cfg, where, opts);
+        },
       };
     },
   },