@saltcorn/server 1.1.4-alpha.0 → 1.1.4-alpha.2

package/routes/sync.js

@@ -24,7 +24,7 @@ router.get(
   })
 );
 
-const getSyncRows = async (syncInfo, table, syncUntil, client, user) => {
+const getSyncRows = async (syncInfo, table, syncUntil, user) => {
   const tblName = table.name;
   const pkName = table.pk_name;
   const minRole = table.min_role_read;
@@ -50,17 +50,17 @@ const getSyncRows = async (syncInfo, table, syncUntil, client, user) => {
   }
   const schema = db.getTenantSchemaPrefix();
   if (!syncInfo.syncFrom) {
-    const { rows } = await client.query(
+    const { rows } = await db.query(
       `select 
          info_tbl.ref "_sync_info_tbl_ref_", 
          info_tbl.last_modified "_sync_info_tbl_last_modified_", 
          info_tbl.deleted "_sync_info_tbl_deleted_",
          data_tbl.*
        from ${schema}"${db.sqlsanitize(
-        tblName
-      )}_sync_info" "info_tbl" right join "${db.sqlsanitize(
-        tblName
-      )}" "data_tbl"
+         tblName
+       )}_sync_info" "info_tbl" right join "${db.sqlsanitize(
+         tblName
+       )}" "data_tbl"
       on info_tbl.ref = data_tbl."${db.sqlsanitize(
         pkName
       )}" and info_tbl.deleted = false
@@ -77,17 +77,17 @@ const getSyncRows = async (syncInfo, table, syncUntil, client, user) => {
     }
     return rows;
   } else {
-    const { rows } = await client.query(
+    const { rows } = await db.query(
       `select 
          info_tbl.ref "_sync_info_tbl_ref_", 
          info_tbl.last_modified "_sync_info_tbl_last_modified_", 
          info_tbl.deleted "_sync_info_tbl_deleted_",
          data_tbl.*
        from ${schema}"${db.sqlsanitize(
-        tblName
-      )}_sync_info" "info_tbl" join ${schema}"${db.sqlsanitize(
-        tblName
-      )}" "data_tbl"
+         tblName
+       )}_sync_info" "info_tbl" join ${schema}"${db.sqlsanitize(
+         tblName
+       )}" "data_tbl"
       on info_tbl.ref = data_tbl."${db.sqlsanitize(pkName)}"
       where date_trunc('milliseconds', info_tbl.last_modified) > to_timestamp(${
         new Date(syncInfo.syncFrom).valueOf() / 1000.0
@@ -117,7 +117,6 @@ const getSyncRows = async (syncInfo, table, syncUntil, client, user) => {
 router.post(
   "/load_changes",
   error_catcher(async (req, res) => {
-    const result = {};
     const { syncInfos, loadUntil } = req.body || {};
     if (!loadUntil) {
       getState().log(2, `POST /load_changes: loadUntil is missing`);
@@ -128,62 +127,55 @@ router.post(
       return res.status(400).json({ error: "syncInfos is missing" });
     }
     const role = req.user ? req.user.role_id : 100;
-    const client = await db.getClient();
-    let rowLimit = 1000;
     try {
-      await client.query(`BEGIN`);
-      for (const [tblName, syncInfo] of Object.entries(syncInfos)) {
-        const table = Table.findOne({ name: tblName });
-        if (!table) throw new Error(`The table '${tblName}' does not exists`);
-        const pkName = table.pk_name;
-        let rows = await getSyncRows(
-          syncInfo,
-          table,
-          loadUntil,
-          client,
-          req.user
-        );
-        if (!rows) continue;
-        if (role > table.min_role_read) {
-          if (
-            role === 100 ||
-            (!table.ownership_field_id && !table.ownership_formula)
-          )
-            continue;
-          else if (table.ownership_field_id) {
-          } else if (table.ownership_formula) {
-            rows = rows.filter((row) => table.is_owner(req.user, row));
+      const result = await db.withTransaction(async () => {
+        let rowLimit = 1000;
+        const result = {};
+
+        for (const [tblName, syncInfo] of Object.entries(syncInfos)) {
+          const table = Table.findOne({ name: tblName });
+          if (!table) throw new Error(`The table '${tblName}' does not exists`);
+          const pkName = table.pk_name;
+          let rows = await getSyncRows(syncInfo, table, loadUntil, req.user);
+          if (!rows) continue;
+          if (role > table.min_role_read) {
+            if (
+              role === 100 ||
+              (!table.ownership_field_id && !table.ownership_formula)
+            )
+              continue;
+            else if (table.ownership_field_id) {
+            } else if (table.ownership_formula) {
+              rows = rows.filter((row) => table.is_owner(req.user, row));
+            }
           }
+          if (rows.length > rowLimit) {
+            rows.splice(rowLimit);
+          }
+          rowLimit -= rows.length;
+          result[tblName] = {
+            rows,
+            maxLoadedId: rows.length > 0 ? rows[rows.length - 1][pkName] : 0,
+          };
         }
-        if (rows.length > rowLimit) {
-          rows.splice(rowLimit);
-        }
-        rowLimit -= rows.length;
-        result[tblName] = {
-          rows,
-          maxLoadedId: rows.length > 0 ? rows[rows.length - 1][pkName] : 0,
-        };
-      }
-      await client.query("COMMIT");
+        return result;
+      });
       res.json(result);
     } catch (error) {
-      await client.query("ROLLBACK");
       getState().log(2, `POST /load_changes: '${error.message}'`);
       res.status(400).json({ error: error.message || error });
-    } finally {
-      client.release(true);
     }
   })
 );
 
-const getDelRows = async (tblName, syncFrom, syncUntil, client) => {
+const getDelRows = async (tblName, syncFrom, syncUntil) => {
   const schema = db.getTenantSchemaPrefix();
-  const dbRes = await client.query(
+  const dbRes = await db.query(
     `select * 
      from (
       select ref, max(last_modified) from ${schema}"${db.sqlsanitize(
-      tblName
-    )}_sync_info" 
+        tblName
+      )}_sync_info" 
       group by ref, deleted having deleted = true) as alias 
       where alias.max < to_timestamp(${syncUntil.valueOf() / 1000.0}) 
         and alias.max > to_timestamp(${syncFrom.valueOf() / 1000.0})`
@@ -203,31 +195,27 @@ router.post(
   "/deletes",
   error_catcher(async (req, res) => {
     const { syncInfos, syncTimestamp } = req.body || {};
-    const client = await db.getClient();
     try {
-      await client.query(`BEGIN`);
-      const syncUntil = new Date(syncTimestamp);
-      const result = {
-        deletes: {},
-      };
-      for (const [tblName, syncInfo] of Object.entries(syncInfos)) {
-        if (syncInfo.syncFrom) {
-          result.deletes[tblName] = await getDelRows(
-            tblName,
-            new Date(syncInfo.syncFrom),
-            syncUntil,
-            client
-          );
+      const result = await db.withTransaction(async () => {
+        const syncUntil = new Date(syncTimestamp);
+        const result = {
+          deletes: {},
+        };
+        for (const [tblName, syncInfo] of Object.entries(syncInfos)) {
+          if (syncInfo.syncFrom) {
+            result.deletes[tblName] = await getDelRows(
+              tblName,
+              new Date(syncInfo.syncFrom),
+              syncUntil
+            );
+          }
         }
-      }
-      await client.query("COMMIT");
+        return result;
+      });
       res.json(result);
     } catch (error) {
-      await client.query("ROLLBACK");
       getState().log(2, `POST /sync/deletes: '${error.message}'`);
       res.status(400).json({ error: error.message || error });
-    } finally {
-      client.release(true);
     }
   })
 );

package/routes/tables.js

@@ -373,6 +373,7 @@ router.post(
       .map((t) => t.table_name);
     const pack = await discover_tables(tableNames);
     await implement_discovery(pack);
+    await getState().refresh_tables();
     req.flash(
       "success",
       req.__("Discovered tables: %s", tableNames.join(", "))
@@ -469,6 +470,7 @@ router.post(
         req.flash("error", parse_res.error);
         res.redirect(`/table/create-from-csv`);
       } else {
+        await getState().refresh_tables();
         Trigger.emitEvent(
           "AppChange",
           `Table ${parse_res.table.name}`,
@@ -1247,11 +1249,15 @@ router.post(
         res.redirect(`/table/provider-cfg/${table.id}`);
       } else {
         delete rest.provider_name;
-        const table = await Table.create(name, rest);
-        Trigger.emitEvent("AppChange", `Table ${name}`, req.user, {
-          entity_type: "Table",
-          entity_name: name,
+        let table;
+        await db.withTransaction(async () => {
+          table = await Table.create(name, rest);
+          Trigger.emitEvent("AppChange", `Table ${name}`, req.user, {
+            entity_type: "Table",
+            entity_name: name,
+          });
         });
+        await getState().refresh_tables();
         req.flash("success", req.__(`Table %s created`, name));
         res.redirect(`/table/${table.id}`);
       }
@@ -1299,8 +1305,10 @@ router.post(
         rest.ownership_formula = rest.ownership_field_id.replace("Fml:", "");
         rest.ownership_field_id = null;
       } else rest.ownership_formula = null;
-      await table.update(rest);
-
+      await db.withTransaction(async () => {
+        await table.update(rest);
+      });
+      await getState().refresh_tables();
       if (!req.xhr) {
         if (!old_versioned && rest.versioned)
           req.flash(
@@ -1344,16 +1352,22 @@ router.post(
       res.redirect(`/table`);
       return;
     }
-    const views = await View.find(
-      t.id ? { table_id: t.id } : { exttable_name: t.name }
-    );
-    for (const view of views) await view.delete();
-    if (t.id) {
-      const triggers = await Trigger.find({ table_id: t.id });
-      for (const trig of triggers) await trig.delete();
-    }
     try {
-      await t.delete();
+      await db.withTransaction(async () => {
+        const views = await View.find(
+          t.id ? { table_id: t.id } : { exttable_name: t.name }
+        );
+        for (const view of views) await view.delete();
+        if (t.id) {
+          const triggers = await Trigger.find({ table_id: t.id });
+          for (const trig of triggers) await trig.delete();
+        }
+
+        await t.delete();
+      });
+      await getState().refresh_tables();
+      await getState().refresh_views();
+      await getState().refresh_triggers();
       req.flash("success", req.__(`Table %s deleted`, t.name));
       res.redirect(`/table`);
     } catch (err) {
@@ -1414,12 +1428,15 @@ router.post(
       }
     }
     try {
-      await t.delete();
-      req.flash("success", req.__(`Table %s deleted`, t.name));
-      Trigger.emitEvent("AppChange", `Table ${t.name} deleted`, req.user, {
-        entity_type: "Table",
-        entity_name: t.name,
+      await db.withTransaction(async () => {
+        await t.delete();
+        req.flash("success", req.__(`Table %s deleted`, t.name));
+        Trigger.emitEvent("AppChange", `Table ${t.name} deleted`, req.user, {
+          entity_type: "Table",
+          entity_name: t.name,
+        });
       });
+      await getState().refresh_tables();
       res.redirect(`/table`);
     } catch (err) {
       req.flash("error", err.message);
@@ -1444,7 +1461,10 @@ router.post(
       return;
     }
     try {
-      await t.delete(true);
+      await db.withTransaction(async () => {
+        await t.delete(true);
+      });
+      await getState().refresh_tables();
       req.flash(
         "success",
         req.__(`Table %s forgotten. You can now discover it.`, t.name)
@@ -1850,11 +1870,15 @@ router.post(
           .filter((f) => form.values[f]);
         configuration.errormsg = form.values.errormsg;
       } else configuration = form.values;
-      await TableConstraint.create({
-        table_id: table.id,
-        type,
-        configuration,
+      await db.withTransaction(async () => {
+        await TableConstraint.create({
+          table_id: table.id,
+          type,
+          configuration,
+        });
       });
+      await getState().refresh_tables();
+
       Trigger.emitEvent(
         "AppChange",
         `Constraint ${type} on table ${table?.name}`,
@@ -1943,8 +1967,12 @@ router.post(
     form.validate(req.body || {});
     if (form.hasErrors) req.flash("error", req.__("An error occurred"));
     else {
-      await table.rename(form.values.name);
+      await db.withTransaction(async () => {
+        await table.rename(form.values.name);
+      });
+      await getState().refresh_tables();
     }
+
     res.redirect(`/table/${table.id}`);
   })
 );
@@ -1962,7 +1990,10 @@ router.post(
   error_catcher(async (req, res) => {
     const { id } = req.params;
     const cons = await TableConstraint.findOne({ id });
-    await cons.delete();
+    await db.withTransaction(async () => {
+      await cons.delete();
+    });
+    await getState().refresh_tables();
     res.redirect(`/table/constraints/${cons.table_id}`);
   })
 );
@@ -2216,10 +2247,12 @@ router.post(
     const table = Table.findOne({ name });
 
     try {
-      await table.deleteRows({}, req.user, true);
+      await db.withTransaction(async () => {
+        await table.deleteRows({}, req.user, true);
+      });
       req.flash("success", req.__("Deleted all rows"));
     } catch (e) {
-      console.error(e)
+      console.error(e);
       req.flash("error", e.message);
     }
 
@@ -2382,6 +2415,7 @@ router.post(
     const workflow = get_provider_workflow(table, req);
     const wfres = await workflow.run(req.body || {}, req);
     respondWorkflow(table, workflow, wfres, req, res);
+    await getState().refresh_tables();
   })
 );
 
@@ -2397,7 +2431,10 @@ router.post(
       res.redirect(`/table`);
       return;
     }
-    await table.repairCompositePrimary();
+    await db.withTransaction(async () => {
+      await table.repairCompositePrimary();
+    });
+    await getState().refresh_tables();
     res.redirect(`/table/${table.id}`);
   })
 );
@@ -2415,68 +2452,70 @@ router.post(
       res.redirect(`/table`);
       return;
     }
-    const initial_view = async (table, viewtemplate) => {
-      const configuration = await initial_config_all_fields(
-        viewtemplate === "Edit"
-      )({ table_id: table.id });
-      //console.log(configuration);
-      const name = `${viewtemplate} ${table.name}`;
-      const view = await View.create({
-        name,
-        configuration,
-        viewtemplate,
-        table_id: table.id,
-        min_role: 100,
-      });
-      return view;
-    };
-    const list = await initial_view(table, "List");
-    const edit = await initial_view(table, "Edit");
-    const show = await initial_view(table, "Show");
-    await View.update(
-      {
-        configuration: {
-          ...list.configuration,
-          columns: [
-            ...list.configuration.columns,
-            {
-              type: "ViewLink",
-              view: `Own:Show ${table.name}`,
-              view_name: `Show ${table.name}`,
-              link_style: "",
-              view_label: "Show",
-              header_label: "Show",
-            },
-            {
-              type: "ViewLink",
-              view: `Own:Edit ${table.name}`,
-              view_name: `Edit ${table.name}`,
-              link_style: "",
-              view_label: "Edit",
-              header_label: "Edit",
-            },
-            {
-              type: "Action",
-              action_name: "Delete",
-              action_style: "btn-primary",
-            },
-          ],
-          view_to_create: `Edit ${table.name}`,
+    await db.withTransaction(async () => {
+      const initial_view = async (table, viewtemplate) => {
+        const configuration = await initial_config_all_fields(
+          viewtemplate === "Edit"
+        )({ table_id: table.id });
+        //console.log(configuration);
+        const name = `${viewtemplate} ${table.name}`;
+        const view = await View.create({
+          name,
+          configuration,
+          viewtemplate,
+          table_id: table.id,
+          min_role: 100,
+        });
+        return view;
+      };
+      const list = await initial_view(table, "List");
+      const edit = await initial_view(table, "Edit");
+      const show = await initial_view(table, "Show");
+      await View.update(
+        {
+          configuration: {
+            ...list.configuration,
+            columns: [
+              ...list.configuration.columns,
+              {
+                type: "ViewLink",
+                view: `Own:Show ${table.name}`,
+                view_name: `Show ${table.name}`,
+                link_style: "",
+                view_label: "Show",
+                header_label: "Show",
+              },
+              {
+                type: "ViewLink",
+                view: `Own:Edit ${table.name}`,
+                view_name: `Edit ${table.name}`,
+                link_style: "",
+                view_label: "Edit",
+                header_label: "Edit",
+              },
+              {
+                type: "Action",
+                action_name: "Delete",
+                action_style: "btn-primary",
+              },
+            ],
+            view_to_create: `Edit ${table.name}`,
+          },
         },
-      },
-      list.id
-    );
-    await View.update(
-      {
-        configuration: {
-          ...edit.configuration,
-          view_when_done: `List ${table.name}`,
-          destination_type: "View",
+        list.id
+      );
+      await View.update(
+        {
+          configuration: {
+            ...edit.configuration,
+            view_when_done: `List ${table.name}`,
+            destination_type: "View",
+          },
         },
-      },
-      edit.id
-    );
-
+        edit.id
+      );
+    });
+    await getState().refresh_views();
     res.redirect(`/table/${table.id}`);
   })
 );

package/routes/utils.js

@@ -164,7 +164,7 @@ const set_custom_http_headers = (res, req, state) => {
         validateHeaderName(k);
         validateHeaderValue(k, val);
         res.header(k, val);
-      } catch (e) {      
+      } catch (e) {
         Crash.create(e, { url: "/", headers: {} });
       }
     }
@@ -200,7 +200,26 @@ const get_tenant_from_req = (req, hostPartsOffset) => {
  * @param {function} next
  */
 const setTenant = (req, res, next) => {
-  if (db.is_it_multi_tenant()) {
+  let wrap =
+    req.method === "POST" && !db.isSQLite
+      ? (f) => {
+          db.getClient().then((client) => {
+            let released = false;
+            res.on("finish", function () {
+              if (!released) client.release();
+              released = true;
+            });
+            res.on("close", function () {
+              if (!released) client.release();
+              released = true;
+            });
+            f(client);
+          });
+        }
+      : (f) => {
+          f(null);
+        };
+  wrap((client) => {
     // for a saltcorn mobile request use 'req.user.tenant'
     if (req.smr) {
       if (
@@ -212,7 +231,7 @@ const setTenant = (req, res, next) => {
           setLanguage(req, res);
           next();
         } else {
-          db.runWithTenant(req.user.tenant, () => {
+          db.runWithTenant({ tenant: req.user.tenant, req, client }, () => {
             setLanguage(req, res, state);
             state.log(5, `${req.method} ${req.originalUrl}`);
             next();
@@ -230,7 +249,7 @@ const setTenant = (req, res, next) => {
           setLanguage(req, res);
           next();
         } else {
-          db.runWithTenant(other_domain, () => {
+          db.runWithTenant({ tenant: other_domain, req, client }, () => {
             setLanguage(req, res, state);
             if (state.logLevel >= 5)
               state.log(
@@ -251,7 +270,7 @@ const setTenant = (req, res, next) => {
           setLanguage(req, res);
           next();
         } else {
-          db.runWithTenant(ten, () => {
+          db.runWithTenant({ tenant: ten, req, client }, () => {
             setLanguage(req, res, state);
             if (state.logLevel >= 5)
               state.log(
@@ -267,17 +286,7 @@ const setTenant = (req, res, next) => {
         }
       }
     }
-  } else {
-    const state = getState();
-    setLanguage(req, res, state);
-    state.log(
-      5,
-      `${req.method} ${req.originalUrl}${
-        state.getConfig("log_ip_address", false) ? ` IP=${req.ip}` : ""
-      }`
-    );
-    next();
-  }
+  });
 };
 
 /**
@@ -504,7 +513,7 @@ const sendHtmlFile = async (req, res, file) => {
         .sendWrap(req.__("An error occurred"), req.__("File not found"));
     }
   } catch (e) {
-    console.error(e)
+    console.error(e);
     return res
       .status(404)
       .sendWrap(
@@ -531,6 +540,7 @@ const setRole = async (req, res, model) => {
     roleRow && page
       ? req.__(`Minimum role for %s updated to %s`, page.name, roleRow.role)
       : req.__(`Minimum role updated`);
+  if (model.state_refresh) await model.state_refresh();
   if (!req.xhr) {
     req.flash("success", message);
     res.redirect("/pageedit");