@saltcorn/data 1.5.5 → 1.5.7

package/dist/models/table.js

@@ -755,17 +755,23 @@ class Table {
                 const schema = db_1.default.getTenantSchemaPrefix();
                 const pkName = this.pk_name || "id";
                 if (isNode()) {
-                    await db_1.default.query(`delete from ${schema}"${db_1.default.sqlsanitize(this.name)}_sync_info" where ref in (
-            ${ids.map((row) => row[pkName]).join(",")})`);
+                    const pkVals = ids.map((row) => row[pkName]);
+                    await db_1.default.query(`delete from ${schema}"${db_1.default.sqlsanitize(this.name)}_sync_info" where ref = ANY($1)`, [pkVals]);
+                    const tsParam = timestamp.valueOf() / 1000.0;
+                    const insertParams = [tsParam];
+                    const valueClauses = pkVals.map((pkVal, i) => {
+                        insertParams.push(pkVal);
+                        return `($${i + 2}, date_trunc('milliseconds', to_timestamp($1)), true)`;
+                    });
                     await db_1.default.query(`insert into ${schema}"${db_1.default.sqlsanitize(this.name)}_sync_info" (ref, last_modified, deleted)
-              values ${ids
-                        .map((row) => `(${row[pkName]}, date_trunc('milliseconds', to_timestamp( ${timestamp.valueOf() / 1000.0} ) ), true)`)
-                        .join(",")}`);
+              values ${valueClauses.join(",")}`, insertParams);
                 }
                 else {
+                    const pkVals = ids.map((row) => row[pkName]);
+                    const placeholders = pkVals.map((_, i) => `$${i + 1}`).join(",");
                     await db_1.default.query(`update "${db_1.default.sqlsanitize(this.name)}_sync_info"
            set deleted = true, modified_local = true
-           where ref in (${ids.map((row) => row[pkName]).join(",")})`);
+           where ref in (${placeholders})`, pkVals);
                 }
             }
         }, (e) => {
@@ -1460,8 +1466,8 @@ class Table {
             }
             else {
                 await db_1.default.query(`insert into "${db_1.default.sqlsanitize(this.name)}_sync_info"
-         (ref, modified_local, deleted) 
-         values('${id}', true, false)`);
+         (ref, modified_local, deleted)
+         values($1, true, false)`, [id]);
             }
         }, (e) => {
             require("../db/state")
@@ -1494,8 +1500,8 @@ class Table {
                 ]);
             }
             else {
-                await db_1.default.query(`update "${db_1.default.sqlsanitize(this.name)}_sync_info" set modified_local = true 
-         where ref = ${id} and last_modified = ${oldLastModified ? oldLastModified.valueOf() : "null"}`);
+                await db_1.default.query(`update "${db_1.default.sqlsanitize(this.name)}_sync_info" set modified_local = true
+         where ref = $1 and last_modified = $2`, [id, oldLastModified ? oldLastModified.valueOf() : null]);
             }
         }, (e) => {
             require("../db/state")
@@ -1750,15 +1756,15 @@ class Table {
                 if (isNode()) {
                     // sync_info for insert
                     const schemaPrefix = db_1.default.getTenantSchemaPrefix();
+                    const tsParam = (syncTimestamp ? syncTimestamp : await db_1.default.time()).valueOf() /
+                        1000.0;
                     await db_1.default.query(`insert into ${schemaPrefix}"${db_1.default.sqlsanitize(this.name)}_sync_info"
-              (ref, last_modified) values(
-              ${id}, date_trunc('milliseconds', to_timestamp(${(syncTimestamp ? syncTimestamp : await db_1.default.time()).valueOf() /
-                        1000.0})))`);
+              (ref, last_modified) values($1, date_trunc('milliseconds', to_timestamp($2)))`, [id, tsParam]);
                 }
                 else {
                     await db_1.default.query(`insert into "${db_1.default.sqlsanitize(this.name)}_sync_info"
            (last_modified, ref, modified_local, deleted)
-           values(NULL, ${id}, true, false)`);
+           values(NULL, $1, true, false)`, [id]);
                 }
             }, (e) => {
                 state.log(2, `Error inserting sync info for table ${this.name}: ${e.message}`);