@saltcorn/sql 0.5.6 → 0.5.8

package/index.js

@@ -64,7 +64,7 @@ const configuration_workflow = () =>
                 input_type: "section_header",
                 label: " ",
                 sublabel: div(
-                  "Use handlebars to access query result in the <code>rows</code> variable. Example: <code>{{#each rows}}&lt;h1&gt;{{this.name}}&lt;/h1&gt;{{/each}}</code>"
+                  "Use handlebars to access query result in the <code>rows</code> variable. Example: <code>{{#each rows}}&lt;h1&gt;{{this.name}}&lt;/h1&gt;{{/each}}</code>",
                 ),
                 showIf: { row_count: "Many" },
               },
@@ -82,7 +82,7 @@ const run = async (
   viewname,
   { sql, output_type, state_parameters, html_code },
   state,
-  { req }
+  { req },
 ) => {
   const is_sqlite = db.isSQLite;
 
@@ -104,7 +104,7 @@ const run = async (
     if (!is_sqlite) {
       await client.query(`SET LOCAL search_path TO "${db.getTenantSchema()}";`);
       await client.query(
-        `SET SESSION CHARACTERISTICS AS TRANSACTION READ ONLY;`
+        `SET SESSION CHARACTERISTICS AS TRANSACTION READ ONLY;`,
       );
     }
     qres = await client.query(sql, phValues);
@@ -123,7 +123,7 @@ const run = async (
         html_code,
         { rows: qres.rows },
         req.user,
-        `HTML code interpolation in view ${viewname}`
+        `HTML code interpolation in view ${viewname}`,
       );
     //return template();
 
@@ -133,7 +133,7 @@ const run = async (
     default: //Table
       return mkTable(
         qres.fields.map((field) => ({ label: field.name, key: field.name })),
-        qres.rows
+        qres.rows,
       );
   }
 };
@@ -157,21 +157,26 @@ module.exports = {
         if (!is_sqlite) {
           db.sql_log(`SET LOCAL search_path TO "${db.getTenantSchema()}";`);
           await client.query(
-            `SET LOCAL search_path TO "${db.getTenantSchema()}";`
+            `SET LOCAL search_path TO "${db.getTenantSchema()}";`,
           );
           db.sql_log(`SET SESSION CHARACTERISTICS AS TRANSACTION READ ONLY;`);
           await client.query(
-            `SET SESSION CHARACTERISTICS AS TRANSACTION READ ONLY;`
+            `SET SESSION CHARACTERISTICS AS TRANSACTION READ ONLY;`,
           );
         }
         db.sql_log(query, parameters || []);
         const qres = await client.query(query, parameters || []);
         db.sql_log("ROLLBACK;");
         await client.query(`ROLLBACK;`);
+        if (!is_sqlite) client.release();
         return qres;
       },
       isAsync: true,
       description: "Run an SQL query",
+      arguments: [
+        { name: "sql_query", type: "String", required: true },
+        { name: "parameters", type: "JSON", tstype: "any[]" },
+      ],
     },
   },
   viewtemplates: [

package/package.json

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

package/table-provider.js

@@ -443,6 +443,8 @@ const countRows = async (cfg, where, opts) => {
   });
 
   const qctx = {};
+  const ensure_no_final_semicolon = (s) =>
+    s.trim().endsWith(";") ? s.trim().slice(0, -1) : s;
 
   if (opts?.forUser) qctx.user = sqlEscapeObject(opts.forUser);
   else if (where?.forUser)
@@ -465,8 +467,14 @@ const countRows = async (cfg, where, opts) => {
   }
 
   //console.trace({ sqlQ, phValues, opts });
-  db.sql_log(`select count(*) from (${sqlQ})`, phValues);
-  const qres = await client.query(`select count(*) from (${sqlQ})`, phValues);
+  db.sql_log(
+    `select count(*) from (${ensure_no_final_semicolon(sqlQ)})`,
+    phValues
+  );
+  const qres = await client.query(
+    `select count(*) from (${ensure_no_final_semicolon(sqlQ)})`,
+    phValues
+  );
   qres.query = sqlQ;
   db.sql_log("ROLLBACK;");
   await client.query(`ROLLBACK;`);