@saltcorn/sql 0.3.3 → 0.3.5

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.3",
+  "version": "0.3.5",
   "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,17 +180,19 @@ 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),
+        };
     const newClause = {
       type: "binary_expr",
       operator: "=",
@@ -221,6 +234,7 @@ const runQuery = async (cfg, where, opts) => {
   }
 
   const sqlQ = parser.sqlify(ast, opt);
+  console.log(sqlQ, phValues);
   const qres = await client.query(sqlQ, phValues);
   qres.query = sqlQ;
   await client.query(`ROLLBACK;`);

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,
+};