@saltcorn/history-control 0.2.3 → 0.3.1

package/common.js

@@ -0,0 +1,51 @@
+const Table = require("@saltcorn/data/models/table");
+const db = require("@saltcorn/data/db");
+const { mkWhere } = require("@saltcorn/db-common/internal");
+
+const runQuery = async (table, whereFull) => {
+  if (whereFull?._fts?.fields) {
+    whereFull._fts.fields = whereFull?._fts?.fields.filter(
+      (f) => f.name !== "_version_id" && f.name !== "_deleted"
+    );
+  }
+
+  const schemaPrefix = db.getTenantSchemaPrefix();
+  const { _is_latest, _deleted, ...whereRest } = whereFull;
+
+  let { where, values } = mkWhere(whereRest || {});
+  where = where.replaceAll('"_version_id"', "(_version || '_' || id)");
+  if (_is_latest) {
+    where = `${
+      where ? where + " and" : "where"
+    } h._version = (select max(ih._version) from ${schemaPrefix}"${db.sqlsanitize(
+      table.name
+    )}__history" ih where ih.id = h.id)`;
+  }
+  if (_deleted === false || _deleted === "false")
+    where = `${
+      where ? where + " and " : "where"
+    } exists(select id from ${schemaPrefix}"${db.sqlsanitize(
+      table.name
+    )}" t where t.id = h.id)`;
+  else if (_deleted)
+    where = `${
+      where ? where + " and " : "where"
+    } not exists(select id from ${schemaPrefix}"${db.sqlsanitize(
+      table.name
+    )}" t where t.id = h.id)`;
+
+  const sql = `select 
+ _version || '_'|| id as _version_id, 
+ _version = (select max(ih._version) from ${schemaPrefix}"${db.sqlsanitize(
+    table.name
+  )}__history" ih where ih.id = h.id) as _is_latest,
+ not exists(select id from ${schemaPrefix}"${db.sqlsanitize(
+    table.name
+  )}" t where t.id = h.id) as _deleted, 
+ * from ${schemaPrefix}"${db.sqlsanitize(table.name)}__history" h ${
+    where.length ? ` ${where}` : ""
+  }`;
+  return await db.query(sql, values);
+};
+
+module.exports = { runQuery };

package/index.js

@@ -1,5 +1,7 @@
 const { features } = require("@saltcorn/data/db/state");
 const Table = require("@saltcorn/data/models/table");
+const Field = require("@saltcorn/data/models/field");
+const { runQuery } = require("./common");
 
 // user subscribe action
 const actions = {
@@ -37,6 +39,7 @@ const actions = {
           insRow[field.name] = row[field.name];
         }
         await real_table.insertRow(insRow);
+        await undelete_cascaded(real_table, insRow);
       } else {
         const updRow = {};
         for (const field of real_table.fields) {
@@ -57,6 +60,38 @@ const actions = {
   },
 };
 
+const undelete_cascaded = async (table, row) => {
+  //inbound keys with on cascade delete
+  const fields = await Field.find(
+    {
+      reftable_name: table.name,
+    },
+    { cached: true }
+  );
+  for (const field of fields) {
+    const ctable = field.table || Table.findOne({ id: field.table_id });
+    if (
+      !ctable.versioned ||
+      !(
+        field.attributes.on_delete_cascade ||
+        field.attributes?.on_delete === "Cascade"
+      )
+    )
+      continue;
+
+    const crows = await runQuery(ctable, { [field.name]: row.id });
+    for (const crow of crows.rows) {
+      if (crow._deleted && crow._is_latest) {
+        const insRow = {};
+        for (const cfield of ctable.fields) {
+          insRow[cfield.name] = crow[cfield.name];
+        }
+        await ctable.insertRow(insRow);
+        await undelete_cascaded(ctable, insRow);
+      }
+    }
+  }
+};
 module.exports = {
   sc_plugin_api_version: 1,
   actions: features?.table_undo ? actions : undefined,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@saltcorn/history-control",
-  "version": "0.2.3",
+  "version": "0.3.1",
   "description": "Allow users to interact with row history",
   "main": "index.js",
   "dependencies": {

package/table-provider.js

@@ -1,4 +1,3 @@
-const db = require("@saltcorn/data/db");
 const { eval_expression } = require("@saltcorn/data/models/expression");
 const Workflow = require("@saltcorn/data/models/workflow");
 const Form = require("@saltcorn/data/models/form");
@@ -8,8 +7,7 @@ const Table = require("@saltcorn/data/models/table");
 const { getState } = require("@saltcorn/data/db/state");
 const { mkTable } = require("@saltcorn/markup");
 const { pre, code } = require("@saltcorn/markup/tags");
-const { mkWhere } = require("@saltcorn/db-common/internal");
-
+const { runQuery } = require("./common");
 const configuration_workflow = (req) =>
   new Workflow({
     steps: [
@@ -35,52 +33,7 @@ const configuration_workflow = (req) =>
       },
     ],
   });
-const runQuery = async (cfg, whereFull, opts) => {
-   if (whereFull?._fts?.fields) {
-    whereFull._fts.fields = whereFull?._fts?.fields.filter(
-      (f) => f.name !== "_version_id" && f.name !== "_deleted"
-    );
-  }
-  const table = Table.findOne({ name: cfg.table });
-
-  const schemaPrefix = db.getTenantSchemaPrefix();
-  const { _is_latest, _deleted, ...whereRest } = whereFull;
-
-  let { where, values } = mkWhere(whereRest || {});
 
-  if (_is_latest) {
-    where = `${
-      where ? where + " and" : "where"
-    } h._version = (select max(ih._version) from ${schemaPrefix}"${db.sqlsanitize(
-      table.name
-    )}__history" ih where ih.id = h.id)`;
-  }
-  if (_deleted === false || _deleted === "false")
-    where = `${
-      where ? where + " and " : "where"
-    } exists(select id from ${schemaPrefix}"${db.sqlsanitize(
-      table.name
-    )}" t where t.id = h.id)`;
-  else if (_deleted)
-    where = `${
-      where ? where + " and " : "where"
-    } not exists(select id from ${schemaPrefix}"${db.sqlsanitize(
-      table.name
-    )}" t where t.id = h.id)`;
-
-  const sql = `select 
-  _version || '_'|| id as _version_id, 
-  _version = (select max(ih._version) from ${schemaPrefix}"${db.sqlsanitize(
-    table.name
-  )}__history" ih where ih.id = h.id) as _is_latest,
-  not exists(select id from ${schemaPrefix}"${db.sqlsanitize(
-    table.name
-  )}" t where t.id = h.id) as _deleted, 
-  * from ${schemaPrefix}"${db.sqlsanitize(table.name)}__history" h ${
-    where.length ? ` ${where}` : ""
-  }`;
-  return await db.query(sql, values);
-};
 module.exports = {
   "History for database table": {
     configuration_workflow,
@@ -112,7 +65,9 @@ module.exports = {
     get_table: (cfg) => {
       return {
         getRows: async (where, opts) => {
-          const qres = await runQuery(cfg, where, opts);
+          const table = Table.findOne({ name: cfg.table });
+
+          const qres = await runQuery(table, where);
           return qres.rows;
         },
       };