@saltcorn/data 1.3.0-beta.1 → 1.3.0-beta.11

package/dist/models/table.js

@@ -1263,6 +1263,7 @@ class Table {
                     [pk_name]: id,
                     _version: {
                         next_version_by_id: id,
+                        pk_name,
                     },
                     _time: new Date(),
                     _userid: user?.id,
@@ -1336,6 +1337,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 +1600,7 @@ class Table {
                 [pk_name]: id,
                 _version: {
                     next_version_by_id: id,
+                    pk_name,
                 },
                 _userid: user?.id,
                 _time: new Date(),
@@ -1646,7 +1649,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 +1725,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 +1926,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 +1943,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 +1963,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 +1987,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 +2018,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);`);
         }
     }
     /**
@@ -2151,8 +2154,10 @@ class Table {
             isBools.includes(v && v.toLowerCase && v.toLowerCase())))
                 type = "Bool";
             else if (nonEmpties.every((v) => !isNaN(v)))
-                if (nonEmpties.every((v) => Number.isSafeInteger(+v)))
+                if (nonEmpties.every((v) => Number.isSafeInteger(+v) && v <= 2147483647 && v > -2147483648))
                     type = "Integer";
+                else if (nonEmpties.every((v) => Number.isSafeInteger(+v)))
+                    type = "String";
                 else
                     type = "Float";
             else if (nonEmpties.every((v) => isDate(v)))
@@ -2360,11 +2365,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 {
@@ -2455,6 +2461,7 @@ class Table {
                                     const existing = await db_1.default.selectMaybeOne(this.name, {
                                         [this.pk_name]: rec[this.pk_name],
                                     });
+                                    this.stringify_json_fields(rec);
                                     if (options?.no_table_write) {
                                         if (existing) {
                                             Object.entries(existing).forEach(([k, v]) => {
@@ -2479,6 +2486,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;
@@ -2507,8 +2515,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}` });
@@ -2531,8 +2540,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 {
@@ -3039,7 +3049,8 @@ ${rejectDetails}`,
             fldNms.push("a.*");
         else
             for (const f of fields.filter((f) => !f.calculated || f.stored)) {
-                fldNms.push(`a."${(0, internal_1.sqlsanitize)(f.name)}"`);
+                if (!opts.fields || opts.fields.includes(f.name))
+                    fldNms.push(`a."${(0, internal_1.sqlsanitize)(f.name)}"`);
             }
         const whereObj = prefixFieldsInWhere(opts.where, "a");
         const { where, values } = (0, internal_1.mkWhere)(whereObj, db_1.default.isSQLite);
@@ -3130,9 +3141,22 @@ ${rejectDetails}`,
                 }
             });
         }
-        //rename joinfields
-        if (Object.values(joinFields || {}).some((jf) => jf.rename_object)) {
+        //rename aggregations and joinfields
+        if (Object.values(joinFields || {}).some((jf) => jf.rename_object) ||
+            Object.values(aggregations || {}).some((jf) => jf.rename_to)) {
             let f = (x) => x;
+            Object.entries(aggregations || {}).forEach(([k, v]) => {
+                if (v.rename_to) {
+                    const oldf = f;
+                    f = (x) => {
+                        if (typeof x[k] !== "undefined") {
+                            x[v.rename_to] = x[k];
+                            delete x[k];
+                        }
+                        return oldf(x);
+                    };
+                }
+            });
             Object.entries(joinFields || {}).forEach(([k, v]) => {
                 if (v.rename_object) {
                     if (v.rename_object.length === 2) {