@saltcorn/sql 0.4.0 → 0.4.2

package/action.js

@@ -3,7 +3,8 @@ const { eval_expression } = require("@saltcorn/data/models/expression");
 
 module.exports = {
   run_sql_code: {
-    configFields: [
+    namespace: "Code",
+    configFields: ({ mode }) => [
       {
         name: "sql",
         label: "SQL",
@@ -19,8 +20,25 @@ module.exports = {
           "Comma separated list of row variables to use as SQL query parameters. User variables can be used as <code>user.id</code> etc",
         type: "String",
       },
+      ...(mode === "workflow"
+        ? [
+            {
+              label: "Variable",
+              name: "results_variable",
+              class: "validate-identifier",
+              sublabel: "Context variable to write to query results to",
+              type: "String",
+              required: true,
+            },
+          ]
+        : []),
     ],
-    run: async ({ row, configuration: { sql, row_parameters }, user }) => {
+    run: async ({
+      row,
+      configuration: { sql, row_parameters, results_variable },
+      user,
+      mode,
+    }) => {
       const is_sqlite = db.isSQLite;
 
       const phValues = [];
@@ -50,6 +68,9 @@ module.exports = {
       await client.query(`COMMIT;`);
 
       if (!is_sqlite) client.release(true);
+      if (mode === "workflow" && results_variable)
+        return { [results_variable]: qres.rows };
+      else return qres.rows;
     },
   },
 };

package/index.js

@@ -148,7 +148,7 @@ module.exports = {
             `SET SESSION CHARACTERISTICS AS TRANSACTION READ ONLY;`
           );
         }
-        const qres = await db.query(query, parameters || []);
+        const qres = await client.query(query, parameters || []);
 
         await client.query(`ROLLBACK;`);
         return qres;

package/package.json

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

package/table-provider.js

@@ -203,8 +203,16 @@ const runQuery = async (cfg, where, opts) => {
             as: null,
           }
         : (ast[0].columns || []).find((c) => c.expr?.as == k);
+    const sqlAggrCol = (ast[0].columns || []).find(
+      (c) =>
+        c.expr?.type === "aggr_func" &&
+        c.expr?.name?.toUpperCase() === k.toUpperCase()
+    );
+
     let left = sqlExprCol
       ? { ...sqlExprCol.expr, as: null }
+      : sqlAggrCol
+      ? { ...sqlAggrCol.expr }
       : {
           type: "column_ref",
           table: sqlCol?.expr?.table,
@@ -222,20 +230,32 @@ const runQuery = async (cfg, where, opts) => {
     }
     const newClause = {
       type: "binary_expr",
-      operator: where[k]?.ilike ? "ILIKE" : "=",
+      operator: where[k]?.ilike && !sqlAggrCol ? "ILIKE" : "=",
       left,
       right: { type: "number", value: "$" + phIndex },
     };
     phIndex += 1;
     phValues.push(where[k]?.ilike ? where[k]?.ilike : where[k]);
-    if (!ast[0].where) ast[0].where = newClause;
-    else {
-      ast[0].where = {
-        type: "binary_expr",
-        operator: "AND",
-        left: ast[0].where,
-        right: newClause,
-      };
+    if (!sqlAggrCol) {
+      if (!ast[0].where) ast[0].where = newClause;
+      else {
+        ast[0].where = {
+          type: "binary_expr",
+          operator: "AND",
+          left: ast[0].where,
+          right: newClause,
+        };
+      }
+    } else {
+      if (!ast[0].having) ast[0].having = newClause;
+      else {
+        ast[0].having = {
+          type: "binary_expr",
+          operator: "AND",
+          left: ast[0].having,
+          right: newClause,
+        };
+      }
     }
   }
   if (where?.limit && where?.offset) {
@@ -275,7 +295,11 @@ const runQuery = async (cfg, where, opts) => {
     if (typeof orderBy === "string")
       ast[0].orderby = [
         {
-          expr: { type: "column_ref", table: null, column: orderBy },
+          expr: {
+            type: "column_ref",
+            table: null,
+            column: db.sqlsanitize(orderBy),
+          },
           type: orderDesc ? "DESC" : "ASC",
         },
       ];
@@ -293,7 +317,7 @@ const runQuery = async (cfg, where, opts) => {
               left: {
                 type: "column_ref",
                 table: null,
-                column: field,
+                column: db.sqlsanitize(field),
               },
               right: {
                 type: "number",