@saltcorn/data 1.4.0-beta.3 → 1.4.0-beta.5

package/dist/models/table.js

@@ -56,7 +56,7 @@ const promises_1 = require("fs/promises");
 //import { num_between } from "@saltcorn/types/generators";
 //import { devNull } from "os";
 const utils_1 = __importDefault(require("../utils"));
-const { prefixFieldsInWhere, InvalidConfiguration, InvalidAdminAction, satisfies, structuredClone, getLines, mergeIntoWhere, stringToJSON, isNode, apply, applyAsync, asyncMap, } = utils_1.default;
+const { prefixFieldsInWhere, InvalidConfiguration, mergeActionResults, InvalidAdminAction, satisfies, structuredClone, getLines, mergeIntoWhere, stringToJSON, isNode, apply, applyAsync, asyncMap, } = utils_1.default;
 const tags_1 = __importDefault(require("@saltcorn/markup/tags"));
 const { text } = tags_1.default;
 const table_helper_1 = require("./internal/table_helper");
@@ -750,22 +750,28 @@ class Table {
         }
     }
     async addDeleteSyncInfo(ids, timestamp) {
-        if (ids.length > 0) {
-            const schema = db_1.default.getTenantSchemaPrefix();
-            const pkName = this.pk_name || "id";
-            if (isNode()) {
-                await db_1.default.query(`delete from ${schema}"${db_1.default.sqlsanitize(this.name)}_sync_info" where ref in (
+        await db_1.default.tryCatchInTransaction(async () => {
+            if (ids.length > 0) {
+                const schema = db_1.default.getTenantSchemaPrefix();
+                const pkName = this.pk_name || "id";
+                if (isNode()) {
+                    await db_1.default.query(`delete from ${schema}"${db_1.default.sqlsanitize(this.name)}_sync_info" where ref in (
             ${ids.map((row) => row[pkName]).join(",")})`);
-                await db_1.default.query(`insert into ${schema}"${db_1.default.sqlsanitize(this.name)}_sync_info" values ${ids
-                    .map((row) => `(${row[pkName]}, date_trunc('milliseconds', to_timestamp( ${timestamp.valueOf() / 1000.0} ) ), true)`)
-                    .join(",")}`);
-            }
-            else {
-                await db_1.default.query(`update "${db_1.default.sqlsanitize(this.name)}_sync_info"
+                    await db_1.default.query(`insert into ${schema}"${db_1.default.sqlsanitize(this.name)}_sync_info" values ${ids
+                        .map((row) => `(${row[pkName]}, date_trunc('milliseconds', to_timestamp( ${timestamp.valueOf() / 1000.0} ) ), true)`)
+                        .join(",")}`);
+                }
+                else {
+                    await db_1.default.query(`update "${db_1.default.sqlsanitize(this.name)}_sync_info"
            set deleted = true, modified_local = true
            where ref in (${ids.map((row) => row[pkName]).join(",")})`);
+                }
             }
-        }
+        }, (e) => {
+            require("../db/state")
+                .getState()
+                .log(2, `Error in addDeleteSyncInfo: ${e.message}`);
+        });
     }
     /**
      * Delete rows from table. The first argument is a where expression indicating the conditions for the rows to be deleted
@@ -780,7 +786,7 @@ class Table {
      * @param user - optional user, if null then no authorization will be checked
      * @returns
      */
-    async deleteRows(where, user, noTrigger) {
+    async deleteRows(where, user, noTrigger, resultCollector) {
         //Fast truncate if user is admin and where is blank
         const cfields = await field_1.default.find({ reftable_name: this.name }, { cached: true });
         if ((!user || user?.role_id === 1) &&
@@ -816,7 +822,7 @@ class Table {
             rows = await this.getJoinedRows({
                 where,
                 forUser: user,
-                forPublic: !user,
+                forPublic: user?.role_id === 100,
             });
         }
         const deleteFileFields = fields.filter((f) => f.type === "File" && f.attributes?.also_delete_file);
@@ -826,13 +832,17 @@ class Table {
             if (!rows)
                 rows = await this.getJoinedRows({
                     where,
+                    forUser: user,
+                    forPublic: user?.role_id === 100,
                 });
             for (const trigger of triggers) {
                 for (const row of rows) {
                     // run triggers on delete
                     if (trigger.haltOnOnlyIf?.(row, user))
                         continue;
-                    await trigger.run(row, { user });
+                    const runres = await trigger.run(row, { user });
+                    if (runres && resultCollector)
+                        mergeActionResults(resultCollector, runres);
                 }
             }
             if (isNode()) {
@@ -1378,40 +1388,61 @@ class Table {
         return rows?.length === 1 ? rows[0] : null;
     }
     async latestSyncInfos(ids) {
-        const schema = db_1.default.getTenantSchemaPrefix();
-        const dbResult = await db_1.default.query(`select max(last_modified) "last_modified", ref
-       from ${schema}"${db_1.default.sqlsanitize(this.name)}_sync_info"
-       group by ref having ref = ${db_1.default.isSQLite ? "" : "ANY"} ($1)`, db_1.default.isSQLite ? ids : [ids]);
-        return dbResult.rows;
+        return await db_1.default.tryCatchInTransaction(async () => {
+            const schema = db_1.default.getTenantSchemaPrefix();
+            const dbResult = await db_1.default.query(`select max(last_modified) "last_modified", ref
+        from ${schema}"${db_1.default.sqlsanitize(this.name)}_sync_info"
+        group by ref having ref = ${db_1.default.isSQLite ? "" : "ANY"} ($1)`, db_1.default.isSQLite ? ids : [ids]);
+            return dbResult.rows;
+        }, (e) => {
+            require("../db/state")
+                .getState()
+                .log(2, `Error in latestSyncInfos: ${e.message}`);
+            return null;
+        });
     }
     async insertSyncInfo(id, syncTimestamp) {
-        const schema = db_1.default.getTenantSchemaPrefix();
-        if (isNode()) {
-            await db_1.default.query(`insert into ${schema}"${db_1.default.sqlsanitize(this.name)}_sync_info" values($1,
+        await db_1.default.tryCatchInTransaction(async () => {
+            const schema = db_1.default.getTenantSchemaPrefix();
+            if (isNode()) {
+                await db_1.default.query(`insert into ${schema}"${db_1.default.sqlsanitize(this.name)}_sync_info" values($1,
         date_trunc('milliseconds', to_timestamp($2)))`, [
-                id,
-                (syncTimestamp ? syncTimestamp : await db_1.default.time()).valueOf() / 1000.0,
-            ]);
-        }
-        else {
-            await db_1.default.query(`insert into "${db_1.default.sqlsanitize(this.name)}_sync_info"
+                    id,
+                    (syncTimestamp ? syncTimestamp : await db_1.default.time()).valueOf() /
+                        1000.0,
+                ]);
+            }
+            else {
+                await db_1.default.query(`insert into "${db_1.default.sqlsanitize(this.name)}_sync_info"
          (ref, modified_local, deleted) 
          values('${id}', true, false)`);
-        }
+            }
+        }, (e) => {
+            require("../db/state")
+                .getState()
+                .log(2, `Error in insertSyncInfo: ${e.message}`);
+        });
     }
     async updateSyncInfo(id, oldLastModified, syncTimestamp) {
-        const schema = db_1.default.getTenantSchemaPrefix();
-        if (!db_1.default.isSQLite) {
-            await db_1.default.query(`update ${schema}"${db_1.default.sqlsanitize(this.name)}_sync_info" set last_modified=date_trunc('milliseconds', to_timestamp($1)) where ref=$2 and last_modified = to_timestamp($3)`, [
-                (syncTimestamp ? syncTimestamp : await db_1.default.time()).valueOf() / 1000.0,
-                id,
-                oldLastModified.valueOf() / 1000.0,
-            ]);
-        }
-        else {
-            await db_1.default.query(`update "${db_1.default.sqlsanitize(this.name)}_sync_info" set modified_local = true 
+        await db_1.default.tryCatchInTransaction(async () => {
+            const schema = db_1.default.getTenantSchemaPrefix();
+            if (!db_1.default.isSQLite) {
+                await db_1.default.query(`update ${schema}"${db_1.default.sqlsanitize(this.name)}_sync_info" set last_modified=date_trunc('milliseconds', to_timestamp($1)) where ref=$2 and last_modified = to_timestamp($3)`, [
+                    (syncTimestamp ? syncTimestamp : await db_1.default.time()).valueOf() /
+                        1000.0,
+                    id,
+                    oldLastModified.valueOf() / 1000.0,
+                ]);
+            }
+            else {
+                await db_1.default.query(`update "${db_1.default.sqlsanitize(this.name)}_sync_info" set modified_local = true 
          where ref = ${id} and last_modified = ${oldLastModified ? oldLastModified.valueOf() : "null"}`);
-        }
+            }
+        }, (e) => {
+            require("../db/state")
+                .getState()
+                .log(2, `Error in updateSyncInfo: ${e.message}`);
+        });
     }
     /**
      * Try to Update row
@@ -1650,17 +1681,21 @@ class Table {
                 _time: new Date(),
             });
         if (this.has_sync_info) {
-            if (isNode()) {
-                const schemaPrefix = db_1.default.getTenantSchemaPrefix();
-                await db_1.default.query(`insert into ${schemaPrefix}"${db_1.default.sqlsanitize(this.name)}_sync_info"
+            await db_1.default.tryCatchInTransaction(async () => {
+                if (isNode()) {
+                    const schemaPrefix = db_1.default.getTenantSchemaPrefix();
+                    await db_1.default.query(`insert into ${schemaPrefix}"${db_1.default.sqlsanitize(this.name)}_sync_info"
            values(${id}, date_trunc('milliseconds', to_timestamp(${(syncTimestamp ? syncTimestamp : await db_1.default.time()).valueOf() /
-                    1000.0})))`);
-            }
-            else {
-                await db_1.default.query(`insert into "${db_1.default.sqlsanitize(this.name)}_sync_info"
+                        1000.0})))`);
+                }
+                else {
+                    await db_1.default.query(`insert into "${db_1.default.sqlsanitize(this.name)}_sync_info"
            (last_modified, ref, modified_local, deleted)
            values(NULL, ${id}, true, false)`);
-            }
+                }
+            }, (e) => {
+                state.log(2, `Error inserting sync info for table ${this.name}: ${e.message}`);
+            });
         }
         const newRow = { [pk_name]: id, ...v };
         await this.auto_update_calc_aggregations(newRow);
@@ -1951,21 +1986,33 @@ class Table {
           );`);
     }
     async create_sync_info_table() {
-        const schemaPrefix = db_1.default.getTenantSchemaPrefix();
-        const fields = this.fields;
-        const pk = fields.find((f) => f.primary_key)?.name;
-        if (!pk) {
-            throw new Error("Unable to find a field with a primary key.");
-        }
-        await db_1.default.query(`create table ${schemaPrefix}"${(0, internal_1.sqlsanitize)(this.name)}_sync_info" (ref integer, last_modified timestamp, deleted boolean default false)`);
-        await db_1.default.query(`create index "${(0, internal_1.sqlsanitize)(this.name)}_sync_info_ref_index" on ${schemaPrefix}"${(0, internal_1.sqlsanitize)(this.name)}_sync_info"(ref)`);
-        await db_1.default.query(`create index "${(0, internal_1.sqlsanitize)(this.name)}_sync_info_lm_index" on ${schemaPrefix}"${(0, internal_1.sqlsanitize)(this.name)}_sync_info"(last_modified)`);
-        await db_1.default.query(`create index "${(0, internal_1.sqlsanitize)(this.name)}_sync_info_deleted_index" on ${schemaPrefix}"${(0, internal_1.sqlsanitize)(this.name)}_sync_info"(deleted)`);
+        await db_1.default.tryCatchInTransaction(async () => {
+            const schemaPrefix = db_1.default.getTenantSchemaPrefix();
+            const fields = this.fields;
+            const pk = fields.find((f) => f.primary_key)?.name;
+            if (!pk) {
+                throw new Error("Unable to find a field with a primary key.");
+            }
+            await db_1.default.query(`create table ${schemaPrefix}"${(0, internal_1.sqlsanitize)(this.name)}_sync_info" (ref integer, last_modified timestamp, deleted boolean default false)`);
+            await db_1.default.query(`create index "${(0, internal_1.sqlsanitize)(this.name)}_sync_info_ref_index" on ${schemaPrefix}"${(0, internal_1.sqlsanitize)(this.name)}_sync_info"(ref)`);
+            await db_1.default.query(`create index "${(0, internal_1.sqlsanitize)(this.name)}_sync_info_lm_index" on ${schemaPrefix}"${(0, internal_1.sqlsanitize)(this.name)}_sync_info"(last_modified)`);
+            await db_1.default.query(`create index "${(0, internal_1.sqlsanitize)(this.name)}_sync_info_deleted_index" on ${schemaPrefix}"${(0, internal_1.sqlsanitize)(this.name)}_sync_info"(deleted)`);
+        }, (e) => {
+            require("../db/state")
+                .getState()
+                .log(2, `Error creating sync_info table for ${this.name}: ${e.message}`);
+        });
     }
     async drop_sync_table() {
-        const schemaPrefix = db_1.default.getTenantSchemaPrefix();
-        await db_1.default.query(`
-      drop table ${schemaPrefix}"${(0, internal_1.sqlsanitize)(this.name)}_sync_info";`);
+        await db_1.default.tryCatchInTransaction(async () => {
+            const schemaPrefix = db_1.default.getTenantSchemaPrefix();
+            await db_1.default.query(`
+        drop table ${schemaPrefix}"${(0, internal_1.sqlsanitize)(this.name)}_sync_info";`);
+        }, (e) => {
+            require("../db/state")
+                .getState()
+                .log(2, `Error dropping sync_info table for ${this.name}: ${e.message}`);
+        });
     }
     /**
      * Restore Row Version