@saltcorn/sql 0.3.2 → 0.3.4

package/index.js

@@ -142,5 +142,6 @@ module.exports = {
       configuration_workflow,
       run,
     },
+    require("./terminal"),
   ],
 };

package/package.json

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

package/table-provider.js

@@ -145,7 +145,7 @@ const sqlEscapeObject = (o) => {
   return r;
 };
 
-const runQuery = async (cfg, where) => {
+const runQuery = async (cfg, where, opts) => {
   const sqlTmpl = cfg?.sql || "";
   const template = _.template(sqlTmpl || "", {
     evaluate: /\{\{#(.+?)\}\}/g,
@@ -154,7 +154,9 @@ const runQuery = async (cfg, where) => {
 
   const qctx = {};
 
-  if (where.forUser) qctx.user = sqlEscapeObject(where.forUser);
+  if (opts?.forUser) qctx.user = sqlEscapeObject(opts.forUser);
+  else if (where?.forUser)
+    qctx.user = sqlEscapeObject(where.forUser); //workaround legacy bug
   else qctx.user = null;
 
   const sql = template(qctx);
@@ -233,8 +235,8 @@ module.exports = {
     fields: (cfg) => cfg?.columns || [],
     get_table: (cfg) => {
       return {
-        getRows: async (where) => {
-          const qres = await runQuery(cfg, where);
+        getRows: async (where, opts) => {
+          const qres = await runQuery(cfg, where, opts);
           return qres.rows;
         },
       };

package/terminal.js

@@ -0,0 +1,85 @@
+const Field = require("@saltcorn/data/models/field");
+const Table = require("@saltcorn/data/models/table");
+const Form = require("@saltcorn/data/models/form");
+const View = require("@saltcorn/data/models/view");
+const Trigger = require("@saltcorn/data/models/trigger");
+const { findType } = require("@saltcorn/data/models/discovery");
+const { save_menu_items } = require("@saltcorn/data/models/config");
+const db = require("@saltcorn/data/db");
+const Workflow = require("@saltcorn/data/models/workflow");
+const { renderForm } = require("@saltcorn/markup");
+const { div, script, domReady, pre, code } = require("@saltcorn/markup/tags");
+const { getState } = require("@saltcorn/data/db/state");
+const { mkTable } = require("@saltcorn/markup");
+
+const get_state_fields = () => [];
+
+const getForm = async (viewname) => {
+  const fields = [
+    {
+      name: "sql",
+      label: "SQL",
+      input_type: "code",
+      attributes: { mode: "text/x-sql" },
+    },
+  ];
+
+  const form = new Form({
+    action: `/view/${viewname}`,
+    fields,
+    submitLabel: "Run query",
+  });
+  return form;
+};
+
+const run = async (table_id, viewname, cfg, state, { res, req }) => {
+  const form = await getForm(viewname);
+  return renderForm(form, req.csrfToken());
+};
+
+const runPost = async (
+  table_id,
+  viewname,
+  config,
+  state,
+  body,
+  { req, res }
+) => {
+  const form = await getForm(viewname);
+  form.validate(body);
+
+  const is_sqlite = db.isSQLite;
+  const client = is_sqlite ? db : await db.getClient();
+  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;`);
+
+    if (!is_sqlite) client.release(true);
+    sqlResult = mkTable(
+      qres.fields.map((field) => ({ label: field.name, key: field.name })),
+      qres.rows
+    );
+  } catch (error) {
+    sqlResult = error.message;
+  }
+
+  res.sendWrap("SQL Terminal", [renderForm(form, req.csrfToken()), sqlResult]);
+};
+
+module.exports = {
+  name: "SQL Terminal",
+  display_state_form: false,
+  tableless: true,
+  singleton: true,
+  get_state_fields,
+  run,
+  runPost,
+};