@saltcorn/data 1.3.0-beta.9 → 1.3.0

package/dist/models/table.js

@@ -836,39 +836,54 @@ class Table {
                 }
             }
         }
-        if (rows) {
-            const delIds = rows.map((r) => r[this.pk_name]);
-            if (!db_1.default.isSQLite) {
-                await db_1.default.deleteWhere(this.name, {
-                    [this.pk_name]: { in: delIds },
-                });
+        await db_1.default.tryCatchInTransaction(async () => {
+            if (rows) {
+                const delIds = rows.map((r) => r[this.pk_name]);
+                if (!db_1.default.isSQLite) {
+                    await db_1.default.deleteWhere(this.name, {
+                        [this.pk_name]: { in: delIds },
+                    });
+                }
+                else {
+                    await db_1.default.query(`delete from "${db_1.default.sqlsanitize(this.name)}" where "${db_1.default.sqlsanitize(this.pk_name)}" in (${delIds.join(",")})`);
+                }
+                for (const row of rows)
+                    await this.auto_update_calc_aggregations(row);
+                if (this.has_sync_info) {
+                    const dbTime = await db_1.default.time();
+                    await this.addDeleteSyncInfo(rows, dbTime);
+                }
             }
             else {
-                await db_1.default.query(`delete from "${db_1.default.sqlsanitize(this.name)}" where "${db_1.default.sqlsanitize(this.pk_name)}" in (${delIds.join(",")})`);
-            }
-            for (const row of rows)
-                await this.auto_update_calc_aggregations(row);
-            if (this.has_sync_info) {
-                const dbTime = await db_1.default.time();
-                await this.addDeleteSyncInfo(rows, dbTime);
+                const delIds = this.has_sync_info
+                    ? await db_1.default.select(this.name, where, {
+                        fields: [this.pk_name],
+                    })
+                    : null;
+                await db_1.default.deleteWhere(this.name, where);
+                if (this.has_sync_info) {
+                    const dbTime = await db_1.default.time();
+                    await this.addDeleteSyncInfo(delIds, dbTime);
+                }
             }
-        }
-        else {
-            const delIds = this.has_sync_info
-                ? await db_1.default.select(this.name, where, {
-                    fields: [this.pk_name],
-                })
-                : null;
-            await db_1.default.deleteWhere(this.name, where);
-            if (this.has_sync_info) {
-                const dbTime = await db_1.default.time();
-                await this.addDeleteSyncInfo(delIds, dbTime);
+            //if (fields.find((f) => f.primary_key)) await this.resetSequence();
+            for (const file of deleteFiles) {
+                await file.delete();
+            }
+        }, (e) => {
+            if (+e.code == 23503 && e.table) {
+                const table = Table.findOne(e.table);
+                const field = table?.fields.find((f) => f.reftable_name === this.name && f.attributes.fkey_error_msg);
+                // TODO there could in theory be multiple key fields onto this table.
+                // check if e.constraint matches tableName_fieldName_fkey. if yes that is field
+                if (field)
+                    throw new Error(field.attributes.fkey_error_msg);
+                else
+                    throw e;
             }
-        }
-        //if (fields.find((f) => f.primary_key)) await this.resetSequence();
-        for (const file of deleteFiles) {
-            await file.delete();
-        }
+            else
+                throw e;
+        });
     }
     /**
      * Returns row with only fields that can be read from db (readFromDB flag)
@@ -1263,6 +1278,7 @@ class Table {
                     [pk_name]: id,
                     _version: {
                         next_version_by_id: id,
+                        pk_name,
                     },
                     _time: new Date(),
                     _userid: user?.id,
@@ -1336,6 +1352,7 @@ class Table {
         this.stringify_json_fields(v1);
         const id = await db_1.default.insert(this.name + "__history", v1, {
             onConflictDoNothing: true,
+            pk_name: this.pk_name,
         });
         if (!id && retry <= 3)
             await this.insert_history_row(v1, retry + 1);
@@ -1598,6 +1615,7 @@ class Table {
                 [pk_name]: id,
                 _version: {
                     next_version_by_id: id,
+                    pk_name,
                 },
                 _userid: user?.id,
                 _time: new Date(),
@@ -1646,7 +1664,7 @@ class Table {
         let v = v0;
         if (refetch && (calc_agg_fields.length || calc_join_agg_fields.length)) {
             v = (await this.getJoinedRow({
-                where: { [pk_name]: v0.id },
+                where: { [pk_name]: v0[pk_name] },
             }));
         }
         //track which rows in which tables are updated
@@ -1722,7 +1740,7 @@ class Table {
                         [matching.field]: {
                             inSelect: {
                                 table: matching.throughTable[0],
-                                field: "id",
+                                field: Table.findOne(matching.throughTable[0])?.pk_name || "id",
                                 tenant: db_1.default.isSQLite ? undefined : db_1.default.getTenantSchema(),
                                 where: { [matching.through[0]]: v[this.pk_name] },
                             },
@@ -1923,7 +1941,7 @@ class Table {
      */
     async restore_row_version(id, version, user) {
         const row = await db_1.default.selectOne(`${db_1.default.sqlsanitize(this.name)}__history`, {
-            id,
+            [this.pk_name]: id,
             _version: version,
         });
         var r = {};
@@ -1940,10 +1958,10 @@ class Table {
      * @param user
      */
     async undo_row_changes(id, user) {
-        const current_version_row = await db_1.default.selectMaybeOne(`${(0, internal_1.sqlsanitize)(this.name)}__history`, { id }, { orderBy: "_version", orderDesc: true, limit: 1 });
+        const current_version_row = await db_1.default.selectMaybeOne(`${(0, internal_1.sqlsanitize)(this.name)}__history`, { [this.pk_name]: id }, { orderBy: "_version", orderDesc: true, limit: 1 });
         //get max that is not a restore
         const last_non_restore = await db_1.default.selectMaybeOne(`${(0, internal_1.sqlsanitize)(this.name)}__history`, {
-            id,
+            [this.pk_name]: id,
             _version: {
                 lt: current_version_row._restore_of_version
                     ? current_version_row._restore_of_version
@@ -1960,10 +1978,10 @@ class Table {
      * @param user
      */
     async redo_row_changes(id, user) {
-        const current_version_row = await db_1.default.selectMaybeOne(`${(0, internal_1.sqlsanitize)(this.name)}__history`, { id }, { orderBy: "_version", orderDesc: true, limit: 1 });
+        const current_version_row = await db_1.default.selectMaybeOne(`${(0, internal_1.sqlsanitize)(this.name)}__history`, { [this.pk_name]: id }, { orderBy: "_version", orderDesc: true, limit: 1 });
         if (current_version_row._restore_of_version) {
             const next_version = await db_1.default.selectMaybeOne(`${(0, internal_1.sqlsanitize)(this.name)}__history`, {
-                id,
+                [this.pk_name]: id,
                 _version: {
                     gt: current_version_row._restore_of_version,
                 },
@@ -1984,10 +2002,10 @@ class Table {
         if (typeof interval_secs === "number" && interval_secs > 0.199) {
             await db_1.default.query(`
       delete from ${schemaPrefix}"${(0, internal_1.sqlsanitize)(this.name)}__history" 
-        where (${(0, internal_1.sqlsanitize)(pk)}, _version) in (
+        where ("${(0, internal_1.sqlsanitize)(pk)}", _version) in (
           select h1."${(0, internal_1.sqlsanitize)(pk)}", h1._version
           FROM ${schemaPrefix}"${(0, internal_1.sqlsanitize)(this.name)}__history" h1
-          JOIN ${schemaPrefix}"${(0, internal_1.sqlsanitize)(this.name)}__history" h2 ON h1.${(0, internal_1.sqlsanitize)(pk)} = h2.${(0, internal_1.sqlsanitize)(pk)}
+          JOIN ${schemaPrefix}"${(0, internal_1.sqlsanitize)(this.name)}__history" h2 ON h1."${(0, internal_1.sqlsanitize)(pk)}" = h2."${(0, internal_1.sqlsanitize)(pk)}"
           AND h1._version < h2._version
           AND h1._time < h2._time
           AND h2._time - h1._time <= INTERVAL '${+interval_secs} seconds'
@@ -2015,7 +2033,7 @@ class Table {
           ON curr.rn = prev.rn + 1 AND curr."${pk}" = prev."${pk}"
         )     
         DELETE FROM ${schemaPrefix}"${(0, internal_1.sqlsanitize)(this.name)}__history"
-          where (${(0, internal_1.sqlsanitize)(pk)}, _version) in (select id, this_version from paired where not is_changed);`);
+          where ("${(0, internal_1.sqlsanitize)(pk)}", _version) in (select id, this_version from paired where not is_changed);`);
         }
     }
     /**
@@ -2362,11 +2380,12 @@ class Table {
         let i = 1;
         let rejects = 0;
         let rejectDetails = "";
-        const client = db_1.default.isSQLite ? db_1.default : await db_1.default.getClient();
+        const client = db_1.default.isSQLite || options?.no_transaction ? db_1.default : await db_1.default.getClient();
         const stats = await (0, promises_1.stat)(filePath);
         const fileSizeInMegabytes = stats.size / (1024 * 1024);
         // start sql transaction
-        await client.query("BEGIN");
+        if (!options?.no_transaction)
+            await client.query("BEGIN");
         const readStream = (0, fs_1.createReadStream)(filePath);
         const returnedRows = [];
         try {
@@ -2482,6 +2501,7 @@ class Table {
                                             });
                                         }
                                         catch (e) {
+                                            console.log(e);
                                             if (!(e?.message || "").includes("current transaction is aborted, commands ignored until end of transaction"))
                                                 rejectDetails += `Reject row ${i} because: ${e?.message}\n`;
                                             rejects += 1;
@@ -2510,8 +2530,9 @@ class Table {
                             }
                         }
                         catch (e) {
-                            await client.query("ROLLBACK");
-                            if (!db_1.default.isSQLite)
+                            if (!options?.no_transaction)
+                                await client.query("ROLLBACK");
+                            if (!db_1.default.isSQLite && !options?.no_transaction)
                                 await client.release(true);
                             if (e instanceof Error)
                                 reject({ error: `${e.message} in row ${i}` });
@@ -2534,8 +2555,9 @@ ${rejectDetails}`,
         if (rejectDetails)
             state.log(6, `CSV import rejectDetails: ` + rejectDetails);
         // stop sql transaction
-        await client.query("COMMIT");
-        if (!db_1.default.isSQLite)
+        if (!options?.no_transaction)
+            await client.query("COMMIT");
+        if (!db_1.default.isSQLite && !options?.no_transaction)
             await client.release(true);
         if (options?.no_table_write) {
             return {