@saltcorn/data 1.3.0-beta.12 → 1.3.0-beta.13

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)