@saltcorn/sql 0.3.8 → 0.4.0

package/index.js

@@ -144,10 +144,13 @@ module.exports = {
           await client.query(
             `SET LOCAL search_path TO "${db.getTenantSchema()}";`
           );
+          await client.query(
+            `SET SESSION CHARACTERISTICS AS TRANSACTION READ ONLY;`
+          );
         }
         const qres = await db.query(query, parameters || []);
 
-        await client.query(`COMMIT;`);
+        await client.query(`ROLLBACK;`);
         return qres;
       },
       isAsync: true,

package/package.json

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

package/table-provider.js

@@ -185,10 +185,24 @@ const runQuery = async (cfg, where, opts) => {
   //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 || (!c.as && k === c.expr?.column)
-    );
-    const sqlExprCol = (ast[0].columns || []).find((c) => c.expr?.as == k);
+    const sqlCol =
+      ast[0].columns == "*"
+        ? {
+            type: "expr",
+            expr: { type: "column_ref", table: null, column: k },
+            as: null,
+          }
+        : (ast[0].columns || []).find(
+            (c) => k === c.as || (!c.as && k === c.expr?.column)
+          );
+    const sqlExprCol =
+      ast[0].columns == "*"
+        ? {
+            type: "expr",
+            expr: { type: "column_ref", table: null, column: k },
+            as: null,
+          }
+        : (ast[0].columns || []).find((c) => c.expr?.as == k);
     let left = sqlExprCol
       ? { ...sqlExprCol.expr, as: null }
       : {
@@ -232,13 +246,68 @@ const runQuery = async (cfg, where, opts) => {
         { type: "number", value: where.offset },
       ],
     };
+  } else if (opts?.limit && opts?.offset) {
+    ast[0].limit = {
+      seperator: "offset",
+      value: [
+        { type: "number", value: opts.limit },
+        { type: "number", value: opts.offset },
+      ],
+    };
   } else if (where?.limit) {
     ast[0].limit = {
       seperator: "",
       value: [{ type: "number", value: where.limit }],
     };
+  } else if (opts?.limit) {
+    ast[0].limit = {
+      seperator: "",
+      value: [{ type: "number", value: opts.limit }],
+    };
   }
+  //console.log(ast[0]);
+  //console.log(ast[0].orderby[[0]]);
 
+  const orderBy = where?.orderBy || opts?.orderBy;
+  const orderDesc = where?.orderDesc || opts?.orderDesc;
+
+  if (orderBy) {
+    if (typeof orderBy === "string")
+      ast[0].orderby = [
+        {
+          expr: { type: "column_ref", table: null, column: orderBy },
+          type: orderDesc ? "DESC" : "ASC",
+        },
+      ];
+    else if (orderBy.operator) {
+      const { operator, field, target } = orderBy;
+      const fieldCol = (cfg.columns || []).find((c) => c.name === field);
+      const type = getState().types[fieldCol?.type];
+      const op = type?.distance_operators[operator];
+      if (op?.type === "SqlBinOp") {
+        ast[0].orderby = [
+          {
+            expr: {
+              type: "binary_expr",
+              operator: op.name,
+              left: {
+                type: "column_ref",
+                table: null,
+                column: field,
+              },
+              right: {
+                type: "number",
+                value: "$" + phIndex,
+              },
+            },
+            type: orderDesc ? "DESC" : "ASC",
+          },
+        ];
+        phIndex += 1;
+        phValues.push(target);
+      }
+    }
+  }
   const client = is_sqlite ? db : await db.getClient();
   await client.query(`BEGIN;`);
   if (!is_sqlite) {
@@ -247,7 +316,7 @@ const runQuery = async (cfg, where, opts) => {
   }
 
   const sqlQ = parser.sqlify(ast, opt);
-  //console.log(sqlQ, phValues);
+  console.log({ sqlQ, phValues, opts });
   const qres = await client.query(sqlQ, phValues);
   qres.query = sqlQ;
   await client.query(`ROLLBACK;`);

package/terminal.js

@@ -53,14 +53,13 @@ const runPost = async (
   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;`);
   }
 
   let sqlResult;
   try {
     const qres = await client.query(form.values.sql, []);
 
-    await client.query(`ROLLBACK;`);
+    await client.query(`COMMIT;`);
 
     if (!is_sqlite) client.release(true);
     sqlResult = mkTable(