@saltcorn/data 1.2.0 → 1.3.0-beta.1

package/dist/models/table.js

@@ -1095,12 +1095,12 @@ class Table {
         // migrating to options arg
         if (typeof noTrigger === "object") {
             const extraOptions = noTrigger;
-            noTrigger = extraOptions.noTrigger;
             resultCollector = extraOptions.resultCollector;
             restore_of_version = extraOptions.restore_of_version;
             syncTimestamp = extraOptions.syncTimestamp;
             additionalTriggerValues = extraOptions.additionalTriggerValues;
             autoRecalcIterations = extraOptions.autoRecalcIterations;
+            noTrigger = extraOptions.noTrigger;
         }
         if (typeof autoRecalcIterations === "number" && autoRecalcIterations > 5)
             return;
@@ -1284,6 +1284,20 @@ class Table {
         const really_changed_field_names = existing
             ? new Set(Object.keys(v).filter((k) => v[k] !== existing[k]))
             : changedFieldNames;
+        let keyChanged = false;
+        for (const fnm of really_changed_field_names || []) {
+            const field = this.getField(fnm);
+            if (field?.is_fkey) {
+                keyChanged = true;
+                break;
+            }
+        }
+        if (!existing && really_changed_field_names.size && keyChanged)
+            existing = await this.getJoinedRow({
+                where: { [pk_name]: id },
+                forUser: user,
+                joinFields,
+            });
         await db_1.default.update(this.name, v, id, {
             pk_name,
             ...sqliteJsonCols,
@@ -1296,8 +1310,11 @@ class Table {
                 await this.insertSyncInfo(id, syncTimestamp);
         }
         const newRow = { ...existing, ...v, [pk_name]: id };
-        if (really_changed_field_names.size > 0)
-            await this.auto_update_calc_aggregations(newRow, !existing, (autoRecalcIterations || 0) + 1, really_changed_field_names);
+        if (really_changed_field_names.size > 0) {
+            await this.auto_update_calc_aggregations(newRow, !existing, (autoRecalcIterations || 0) + 1, really_changed_field_names, keyChanged);
+            if (existing && keyChanged)
+                await this.auto_update_calc_aggregations(existing, !existing, (autoRecalcIterations || 0) + 1, really_changed_field_names, keyChanged);
+        }
         if (!noTrigger) {
             const trigPromise = trigger_1.default.runTableTriggers("Update", this, { ...(additionalTriggerValues || {}), ...newRow }, resultCollector, role === 100 ? undefined : user, { old_row: existing, updated_fields: v_in });
             if (resultCollector)
@@ -1608,7 +1625,7 @@ class Table {
         }
         return id;
     }
-    async auto_update_calc_aggregations(v0, refetch, iterations = 1, changedFields) {
+    async auto_update_calc_aggregations(v0, refetch, iterations = 1, changedFields, keyChanged = false) {
         const state = require("../db/state").getState();
         const pk_name = this.pk_name;
         state.log(6, `auto_update_calc_aggregations table=${this.name} id=${v0[pk_name]} iters=${iterations}${changedFields ? ` changedFields=${[...(changedFields || [])]}` : ""}`);
@@ -1636,7 +1653,7 @@ class Table {
         const updated = {};
         for (const calc_field of calc_agg_fields) {
             const agg_field_name = calc_field.attributes.agg_field.split("@")[0];
-            if (changedFields && !changedFields.has(agg_field_name))
+            if (changedFields && !changedFields.has(agg_field_name) && !keyChanged)
                 continue;
             const refTable = Table.findOne({ id: calc_field.table_id });
             if (!refTable || !v[calc_field.attributes.ref])
@@ -2299,7 +2316,7 @@ class Table {
             else if (headers.map((h) => field_1.default.labelToName(h)).includes(f.name)) {
                 okHeaders[f.name] = f;
                 renames.push({
-                    from: headers.find((h) => field_1.default.labelToName(h) === f.name),
+                    from: headers.find((h) => field_1.default.labelToName(h) === f.name) || "",
                     to: f.name,
                 });
             }
@@ -2493,7 +2510,8 @@ class Table {
                             await client.query("ROLLBACK");
                             if (!db_1.default.isSQLite)
                                 await client.release(true);
-                            reject({ error: `${e.message} in row ${i}` });
+                            if (e instanceof Error)
+                                reject({ error: `${e.message} in row ${i}` });
                         }
                     }, (err) => {
                         reject({ error: !err ? err : err.message || err });
@@ -3327,7 +3345,7 @@ async function dump_table_to_json_file(filePath, tableName) {
     const writeStream = (0, fs_1.createWriteStream)(filePath);
     const client = db_1.default.isSQLite ? db_1.default : await db_1.default.getClient();
     writeStream.write("[");
-    await db_1.default.copyToJson(writeStream, tableName, client);
+    db_1.default.copyToJson && (await db_1.default.copyToJson(writeStream, tableName, client));
     if (!db_1.default.isSQLite)
         await client.release(true);
     writeStream.destroy();