@saltcorn/data 1.1.2-beta.8 → 1.1.2

package/dist/models/table.js

@@ -15,23 +15,13 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -60,6 +50,7 @@ const tags_1 = __importDefault(require("@saltcorn/markup/tags"));
 const { text } = tags_1.default;
 const table_helper_1 = require("./internal/table_helper");
 const query_1 = require("./internal/query");
+const async_json_stream_1 = __importDefault(require("./internal/async_json_stream"));
 /**
  * Transponce Objects
  * TODO more detailed explanation
@@ -353,12 +344,12 @@ class Table {
      * tbd why this function in this file - needs to models
      * @param opts
      */
-    async get_models(opts) {
+    async get_models(where) {
         const Model = require("./model");
-        if (typeof opts === "string")
-            return await Model.find({ name: opts, table_id: this.id });
+        if (typeof where === "string")
+            return await Model.find({ name: where, table_id: this.id });
         else
-            return await Model.find({ ...(opts || {}), table_id: this.id });
+            return await Model.find({ ...(where || {}), table_id: this.id });
     }
     /**
      * Get owner column name
@@ -369,7 +360,7 @@ class Table {
         if (!this.ownership_field_id || !fields)
             return null;
         const field = fields.find((f) => f.id === this.ownership_field_id);
-        return field?.name;
+        return field?.name || null;
     }
     /**
      * Get owner column name
@@ -386,7 +377,7 @@ class Table {
      * Check if user is owner of row
      * @param user - user
      * @param row - table row
-     * @returns {Promise<string|null|*|boolean>}
+     * @returns {boolean}
      */
     is_owner(user, row) {
         if (!user)
@@ -398,7 +389,7 @@ class Table {
         const field_name = this.owner_fieldname();
         // users are owners of their own row in users table
         if (this.name === "users" && !field_name)
-            return user.id && `${row?.id}` === `${user.id}`;
+            return !!user.id && `${row?.id}` === `${user.id}`;
         return (typeof field_name === "string" &&
             (row[field_name] === user.id || row[field_name]?.id === user.id));
     }
@@ -706,7 +697,7 @@ class Table {
         if (db_1.default.reset_sequence &&
             (0, common_types_1.instanceOfType)(pk.type) &&
             pk.type.name === "Integer")
-            await db_1.default.reset_sequence(this.name);
+            await db_1.default.reset_sequence(this.name, this.pk_name);
     }
     /**
      * update Where with Ownership
@@ -722,7 +713,11 @@ class Table {
             role > min_role &&
             ((!this.ownership_field_id && !this.ownership_formula) || role === 100))
             return { notAuthorized: true };
-        if (user && role < 100 && role > min_role && this.ownership_field_id) {
+        if (user &&
+            role &&
+            role < 100 &&
+            role > min_role &&
+            this.ownership_field_id) {
             const owner_field = fields.find((f) => f.id === this.ownership_field_id);
             if (!owner_field)
                 throw new Error(`Owner field in table ${this.name} not found`);
@@ -731,6 +726,7 @@ class Table {
             });
         }
         else if (user &&
+            role &&
             role < 100 &&
             role > min_role &&
             this.ownership_formula) {
@@ -1094,8 +1090,25 @@ class Table {
      * @returns
      */
     async updateRow(v_in, id, user, noTrigger, resultCollector, restore_of_version, syncTimestamp, additionalTriggerValues, autoRecalcIterations) {
+        // 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;
+        }
+        if (typeof autoRecalcIterations === "number" && autoRecalcIterations > 5)
+            return;
         let existing;
         let v = { ...v_in };
+        //these may have changed
+        let changedFieldNames = new Set([
+            ...Object.keys(v_in),
+            ...this.fields.filter((f) => f.calculated).map((f) => f.name),
+        ]);
         const fields = this.fields;
         const pk_name = this.pk_name;
         const role = user?.role_id;
@@ -1216,7 +1229,7 @@ class Table {
                     joinFields,
                 });
             }
-            let calced = await apply_calculated_fields_stored(need_to_update ? updated : { ...existing, ...v_in }, this.fields, this);
+            let calced = await apply_calculated_fields_stored(need_to_update ? updated || {} : { ...existing, ...v_in }, this.fields, this);
             for (const f of fields)
                 if (f.calculated && f.stored) {
                     if (typeof f.type !== "string" &&
@@ -1273,7 +1286,7 @@ class Table {
                 await this.insertSyncInfo(id, syncTimestamp);
         }
         const newRow = { ...existing, ...v, [pk_name]: id };
-        await this.auto_update_calc_aggregations(newRow, !existing, autoRecalcIterations || 1);
+        await this.auto_update_calc_aggregations(newRow, !existing, (autoRecalcIterations || 0) + 1, changedFieldNames);
         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)
@@ -1385,17 +1398,17 @@ class Table {
     get pk_name() {
         const pkField = this.fields?.find((f) => f.primary_key)?.name;
         if (!pkField) {
-            throw new Error("A primary key field is mandatory");
+            throw new Error(`A primary key field is mandatory (Table ${this.name})`);
         }
         return pkField;
     }
     get pk_type() {
         const pkField = this.fields?.find((f) => f.primary_key);
         if (!pkField) {
-            throw new Error("A primary key field is mandatory");
+            throw new Error(`A primary key field is mandatory (Table ${this.name})`);
         }
         if (!(0, common_types_1.instanceOfType)(pkField.type)) {
-            throw new Error("A primary key field must have a type");
+            throw new Error(`A primary key field must have a type (Table ${this.name})`);
         }
         return pkField.type;
     }
@@ -1561,7 +1574,8 @@ class Table {
             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})))`);
+           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"
@@ -1578,7 +1592,7 @@ class Table {
         }
         return id;
     }
-    async auto_update_calc_aggregations(v0, refetch, iterations = 1) {
+    async auto_update_calc_aggregations(v0, refetch, iterations = 1, changedFields) {
         if (iterations > 5)
             return;
         const calc_agg_fields = await field_1.default.find({
@@ -1594,6 +1608,9 @@ class Table {
             }));
         }
         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))
+                continue;
             const refTable = Table.findOne({ id: calc_field.table_id });
             if (!refTable || !v[calc_field.attributes.ref])
                 continue;
@@ -1620,6 +1637,11 @@ class Table {
                 continue;
             const refTable = field.table || Table.findOne({ id: field.table_id });
             for (const matching of matchings) {
+                //console.log({ matching, changedFields });
+                if (changedFields &&
+                    matching.targetField &&
+                    !changedFields.has(matching.targetField))
+                    continue;
                 if (matching.through?.length === 1) {
                     // select readings where patient_id.favbook = v.id
                     // select reftable where field.through[0] = v.id
@@ -1970,7 +1992,7 @@ class Table {
      * @returns {Promise<*>}
      */
     async get_history(id) {
-        return await db_1.default.select(`${(0, internal_1.sqlsanitize)(this.name)}__history`, id ? { id } : {}, { orderBy: "_version" });
+        return await db_1.default.select(`${(0, internal_1.sqlsanitize)(this.name)}__history`, id ? { [this.pk_name]: id } : {}, { orderBy: "_version" });
     }
     /**
      * Enable constraints
@@ -2219,7 +2241,10 @@ class Table {
         const returnedRows = [];
         try {
             // for files more 1MB
-            if (db_1.default.copyFrom && fileSizeInMegabytes > 1) {
+            if (options?.method === "copy" ||
+                (options?.method !== "row-by-row" &&
+                    db_1.default.copyFrom &&
+                    fileSizeInMegabytes > 1)) {
                 let theError;
                 const copyres = await db_1.default
                     .copyFrom(readStream, this.name, fieldNames, client)
@@ -2424,6 +2449,11 @@ ${rejectDetails}`,
             });
         return v1;
     }
+    async import_json_history_file(filePath) {
+        return await (0, async_json_stream_1.default)(filePath, async (row) => {
+            await this.insert_history_row(row);
+        });
+    }
     /**
      * Import JSON table description
      * @param filePath
@@ -2431,20 +2461,20 @@ ${rejectDetails}`,
      * @returns {Promise<{error: string}|{success: string}>}
      */
     async import_json_file(filePath, skip_first_data_row) {
-        const contents = (await (0, promises_1.readFile)(filePath)).toString();
-        // todo argument type buffer is not assignable for type String...
-        const file_rows = contents === "\\N\n" ? [] : JSON.parse(contents);
         const fields = this.fields;
         const pk_name = this.pk_name;
         const { readState } = require("../plugin-helper");
         const jsonFields = fields.filter((f) => typeof f.type !== "string" && f?.type?.name === "JSON");
         let i = 1;
+        let importError;
         const client = db_1.default.isSQLite ? db_1.default : await db_1.default.getClient();
         await client.query("BEGIN");
-        for (const rec of file_rows) {
+        const consume = async (rec) => {
             i += 1;
             if (skip_first_data_row && i === 2)
-                continue;
+                return;
+            if (importError)
+                return;
             fields
                 .filter((f) => f.calculated && !f.stored)
                 .forEach((f) => {
@@ -2466,15 +2496,20 @@ ${rejectDetails}`,
                 await client.query("ROLLBACK");
                 if (!db_1.default.isSQLite)
                     await client.release(true);
-                return { error: `${e.message} in row ${i}` };
+                importError = `${e.message} in row ${i}`;
             }
-        }
+        };
+        await (0, async_json_stream_1.default)(filePath, async (row) => {
+            await consume(row);
+        });
+        if (importError)
+            return { error: importError };
         await client.query("COMMIT");
         if (!db_1.default.isSQLite)
             await client.release(true);
         await this.resetSequence();
         return {
-            success: `Imported ${file_rows.length} rows into table ${this.name}`,
+            success: `Imported ${i - 1} rows into table ${this.name}`,
         };
     }
     /**
@@ -2761,8 +2796,9 @@ ${rejectDetails}`,
                 }
             }
         }
+        const isConstant = (x) => ["string", "number", "boolean"].includes(typeof x);
         //TODO user groups
-        if (wh.eq)
+        if (wh.eq && !wh.eq.every(isConstant))
             return {};
         return wh;
     }
@@ -2830,9 +2866,9 @@ ${rejectDetails}`,
             if (!joinTables.includes(jtNm)) {
                 joinTables.push(jtNm);
                 if (ontable)
-                    joinq += `\n left join ${schema}"${(0, internal_1.sqlsanitize)(reftable)}" ${jtNm} on ${jtNm}."${(0, internal_1.sqlsanitize)(ref)}"=a."${reffield.refname}"`;
+                    joinq += `\n left join ${schema}"${(0, internal_1.sqlsanitize)(reftable)}" "${jtNm}" on "${jtNm}"."${(0, internal_1.sqlsanitize)(ref)}"=a."${reffield.refname}"`;
                 else
-                    joinq += `\n left join ${schema}"${(0, internal_1.sqlsanitize)(reftable)}" ${jtNm} on ${jtNm}."${reffield.refname}"=a."${(0, internal_1.sqlsanitize)(ref)}"`;
+                    joinq += `\n left join ${schema}"${(0, internal_1.sqlsanitize)(reftable)}" "${jtNm}" on "${jtNm}"."${reffield.refname}"=a."${(0, internal_1.sqlsanitize)(ref)}"`;
             }
             if (through) {
                 const throughs = Array.isArray(through) ? through : [through];
@@ -2852,21 +2888,22 @@ ${rejectDetails}`,
                     if (!throughRefField)
                         throw new InvalidConfiguration(`Reference field field ${through} not found in table ${throughTable.name}`);
                     const finalTable = throughRefField.reftable_name;
+                    const finalTableObj = Table.findOne({ name: finalTable });
                     jtNm1 = `${(0, internal_1.sqlsanitize)(last_reffield.reftable_name)}_jt_${(0, internal_1.sqlsanitize)(throughPath.join("_"))}_jt_${(0, internal_1.sqlsanitize)(ref)}`;
                     if (!joinTables.includes(jtNm1)) {
                         if (!finalTable)
                             throw new Error("Unable to build a joind without a reftable_name.");
                         joinTables.push(jtNm1);
-                        joinq += `\n left join ${schema}"${(0, internal_1.sqlsanitize)(finalTable)}" ${jtNm1} on ${jtNm1}.id=${lastJtNm}."${(0, internal_1.sqlsanitize)(through1)}"`;
+                        joinq += `\n left join ${schema}"${(0, internal_1.sqlsanitize)(finalTable)}" "${jtNm1}" on "${jtNm1}"."${finalTableObj.pk_name}"="${lastJtNm}"."${(0, internal_1.sqlsanitize)(through1)}"`;
                     }
                     last_reffield = throughRefField;
                     lastJtNm = jtNm1;
                 }
                 // todo warning variable might not have been initialized
-                fldNms.push(`${jtNm1}.${(0, internal_1.sqlsanitize)(target)} as ${(0, internal_1.sqlsanitize)(fldnm)}`);
+                fldNms.push(`"${jtNm1}"."${(0, internal_1.sqlsanitize)(target)}" as "${(0, internal_1.sqlsanitize)(fldnm)}"`);
             }
             else {
-                fldNms.push(`${jtNm}.${(0, internal_1.sqlsanitize)(target)} as ${(0, internal_1.sqlsanitize)(fldnm)}`);
+                fldNms.push(`"${jtNm}"."${(0, internal_1.sqlsanitize)(target)}" as "${(0, internal_1.sqlsanitize)(fldnm)}"`);
             }
         }
         if (opts.starFields)
@@ -3095,22 +3132,43 @@ ${rejectDetails}`,
         return (0, table_helper_1.get_formula_examples)(typename, this.fields.filter((f) => !f.calculated));
     }
     async repairCompositePrimary() {
-        const { rows } = await db_1.default.query(`select constraint_name
+        const primaryKeys = this.fields.filter((f) => f.primary_key);
+        const nonSerialPKS = primaryKeys.some((f) => f.attributes?.NonSerial);
+        const schemaPrefix = db_1.default.getTenantSchemaPrefix();
+        if (primaryKeys.length == 0) {
+            await db_1.default.query(`alter table ${schemaPrefix}"${this.name}" add column id serial primary key;`);
+            await db_1.default.query(`insert into ${schemaPrefix}_sc_fields(table_id, name, label, type, attributes, required, is_unique,primary_key)
+        values($1,'id','ID','Integer', '{}', true, true, true) returning id`, [this.id]);
+        }
+        else if (primaryKeys.length > 1) {
+            const { rows } = await db_1.default.query(`select constraint_name
 from information_schema.table_constraints
 where table_schema = '${db_1.default.getTenantSchema() || "public"}'
       and table_name = '${this.name}'
       and constraint_type = 'PRIMARY KEY';`);
-        const cname = rows[0]?.constraint_name;
-        const schemaPrefix = db_1.default.getTenantSchemaPrefix();
-        await db_1.default.query(`alter table ${schemaPrefix}"${this.name}" drop constraint "${cname}"`);
-        for (const field of this.fields) {
-            if (field.primary_key)
-                await field.update({ primary_key: false });
-        }
-        const { pk_type, pk_sql_type } = Table.pkSqlType(this.fields);
-        await db_1.default.query(`alter table ${schemaPrefix}"${this.name}" add column id ${pk_sql_type} primary key;`);
-        await db_1.default.query(`insert into ${schemaPrefix}_sc_fields(table_id, name, label, type, attributes, required, is_unique,primary_key)
+            const cname = rows[0]?.constraint_name;
+            await db_1.default.query(`alter table ${schemaPrefix}"${this.name}" drop constraint "${cname}"`);
+            for (const field of this.fields) {
+                if (field.primary_key)
+                    await field.update({ primary_key: false });
+            }
+            const { pk_type, pk_sql_type } = Table.pkSqlType(this.fields);
+            await db_1.default.query(`alter table ${schemaPrefix}"${this.name}" add column id ${pk_sql_type} primary key;`);
+            await db_1.default.query(`insert into ${schemaPrefix}_sc_fields(table_id, name, label, type, attributes, required, is_unique,primary_key)
         values($1,'id','ID','${pk_type}', '{}', true, true, true) returning id`, [this.id]);
+        }
+        else if (nonSerialPKS) {
+            //https://stackoverflow.com/questions/23578427/changing-primary-key-int-type-to-serial
+            await db_1.default.query(`CREATE SEQUENCE ${schemaPrefix}"${this.name}_id_seq";`);
+            await db_1.default.query(`ALTER SEQUENCE ${schemaPrefix}"${this.name}_id_seq" OWNED BY ${schemaPrefix}"${this.name}"."${this.pk_name}"`);
+            await db_1.default.query(`SELECT setval('${schemaPrefix}"${this.name}_id_seq"', MAX(a."${this.pk_name}")) from ${schemaPrefix}"${this.name}" a`);
+            await db_1.default.query(`ALTER TABLE ${schemaPrefix}"${this.name}" ALTER COLUMN "${this.pk_name}" SET DEFAULT nextval('${schemaPrefix}"${this.name}_id_seq"')`);
+            const pk = this.getField(this.pk_name);
+            const attrs = { ...pk.attributes };
+            delete attrs.NonSerial;
+            await pk.update({ attributes: attrs });
+        }
+        await require("../db/state").getState().refresh_tables();
     }
     async move_include_fts_to_search_context() {
         const include_fts_fields = this.fields.filter((f) => f.attributes?.include_fts);