@saltcorn/sql 0.3.4 → 0.3.6

package/package.json

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

package/table-provider.js

@@ -4,6 +4,7 @@ const Workflow = require("@saltcorn/data/models/workflow");
 const Form = require("@saltcorn/data/models/form");
 const FieldRepeat = require("@saltcorn/data/models/fieldrepeat");
 const Field = require("@saltcorn/data/models/field");
+const Table = require("@saltcorn/data/models/table");
 const { getState } = require("@saltcorn/data/db/state");
 const SqlString = require("sqlstring");
 const { Parser } = require("node-sql-parser");
@@ -63,6 +64,14 @@ const configuration_workflow = (req) =>
           const pkey_options = getState().type_names.filter(
             (tnm) => getState().types[tnm]?.primaryKey
           );
+          const tables = await Table.find({});
+
+          const fkey_opts = [
+            "File",
+            ...tables
+              .filter((t) => !t.provider_name && !t.external)
+              .map((t) => `Key to ${t.name}`),
+          ];
           const theForm = new Form({
             blurb: pre(code(qres.query)) + tbl,
             fields: [
@@ -90,7 +99,9 @@ const configuration_workflow = (req) =>
                     label: "Type",
                     type: "String",
                     required: true,
-                    attributes: { options: getState().type_names },
+                    attributes: {
+                      options: getState().type_names.concat(fkey_opts || []),
+                    },
                   },
                   {
                     name: "primary_key",
@@ -169,25 +180,36 @@ const runQuery = async (cfg, where, opts) => {
   const { ast } = parser.parse(sql, opt);
 
   const colNames = new Set((cfg?.columns || []).map((c) => c.name));
-
   let phIndex = 1;
   const phValues = [];
   for (const k of Object.keys(where)) {
     if (!colNames.has(k)) continue;
     const sqlCol = (ast[0].columns || []).find((c) => k === c.as);
-    let left = {
-      type: "column_ref",
-      table: sqlCol?.expr?.table,
-      column: db.sqlsanitize(k),
-    };
+    const sqlExprCol = (ast[0].columns || []).find((c) => c.expr?.as == k);
+    let left = sqlExprCol
+      ? { ...sqlExprCol.expr, as: null }
+      : {
+          type: "column_ref",
+          table: sqlCol?.expr?.table,
+          column: db.sqlsanitize(k),
+        };
+    if (!sqlCol) {
+      const starCol = (ast[0].columns || []).find((c) => c.type === "star_ref");
+      if (starCol)
+        left = {
+          type: "column_ref",
+          table: starCol?.expr?.table,
+          column: db.sqlsanitize(k),
+        };
+    }
     const newClause = {
       type: "binary_expr",
-      operator: "=",
+      operator: where[k]?.ilike ? "ILIKE" : "=",
       left,
       right: { type: "number", value: "$" + phIndex },
     };
     phIndex += 1;
-    phValues.push(where[k]);
+    phValues.push(where[k]?.ilike ? where[k]?.ilike : where[k]);
     if (!ast[0].where) ast[0].where = newClause;
     else {
       ast[0].where = {