@saltcorn/sql 0.3.5 → 0.3.7

package/package.json

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

package/table-provider.js

@@ -182,25 +182,38 @@ const runQuery = async (cfg, where, opts) => {
   const colNames = new Set((cfg?.columns || []).map((c) => c.name));
   let phIndex = 1;
   const phValues = [];
+  //console.log(ast[0].columns);
   for (const k of Object.keys(where)) {
     if (!colNames.has(k)) continue;
-    const sqlCol = (ast[0].columns || []).find((c) => k === c.as);
+    const sqlCol = (ast[0].columns || []).find(
+      (c) => k === c.as || (!c.as && k === c.expr?.column)
+    );
     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: sqlCol?.expr?.column || db.sqlsanitize(k),
+        };
+    //console.log({ k, sqlCol, sqlExprCol });
+    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 = {
@@ -234,7 +247,7 @@ const runQuery = async (cfg, where, opts) => {
   }
 
   const sqlQ = parser.sqlify(ast, opt);
-  console.log(sqlQ, phValues);
+  //console.log(sqlQ, phValues);
   const qres = await client.query(sqlQ, phValues);
   qres.query = sqlQ;
   await client.query(`ROLLBACK;`);