@saltcorn/data 1.5.0-beta.14 → 1.5.0-beta.16

package/dist/models/table.js

@@ -757,7 +757,8 @@ class Table {
                 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(",")})`);
-                    await db_1.default.query(`insert into ${schema}"${db_1.default.sqlsanitize(this.name)}_sync_info" values ${ids
+                    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(",")}`);
                 }
@@ -1364,9 +1365,9 @@ class Table {
         if (this.has_sync_info) {
             const oldInfo = await this.latestSyncInfo(id);
             if (oldInfo && !oldInfo.deleted)
-                await this.updateSyncInfo(id, oldInfo.last_modified, syncTimestamp);
+                await this.updateSyncInfo(id, v, oldInfo.last_modified, syncTimestamp);
             else
-                await this.insertSyncInfo(id, syncTimestamp);
+                await this.insertSyncInfo(id, v, syncTimestamp);
             if (state.pushHelper)
                 state.pushHelper.pushSync(this.name);
         }
@@ -1407,10 +1408,26 @@ class Table {
     async latestSyncInfos(ids) {
         return await db_1.default.tryCatchInTransaction(async () => {
             const schema = db_1.default.getTenantSchemaPrefix();
-            const dbResult = await db_1.default.query(`select max(last_modified) "last_modified", ref
-        from ${schema}"${db_1.default.sqlsanitize(this.name)}_sync_info"
-        group by ref having ref = ${db_1.default.isSQLite ? "" : "ANY"} ($1)`, db_1.default.isSQLite ? ids : [ids]);
-            return dbResult.rows;
+            const sql = !db_1.default.isSQLite
+                ? `
+  SELECT s.last_modified, s.ref, s.updated_fields
+  FROM ${schema}"${db_1.default.sqlsanitize(this.name)}_sync_info" s
+  JOIN (
+    SELECT
+      ref,
+      MAX(last_modified) AS last_modified
+    FROM ${schema}"${db_1.default.sqlsanitize(this.name)}_sync_info"
+    WHERE ref = ${db_1.default.isSQLite ? "" : "ANY"} ($1)
+    GROUP BY ref
+  ) m
+    ON s.ref = m.ref
+   AND s.last_modified = m.last_modified`
+                : `
+  SELECT MAX(last_modified) "last_modified", ref
+  FROM ${schema}"${db_1.default.sqlsanitize(this.name)}_sync_info"
+  GROUP BY ref HAVING ref = ($1)`;
+            const result = await db_1.default.query(sql, db_1.default.isSQLite ? ids : [ids]);
+            return result.rows;
         }, (e) => {
             require("../db/state")
                 .getState()
@@ -1418,16 +1435,21 @@ class Table {
             return null;
         });
     }
-    async insertSyncInfo(id, syncTimestamp) {
+    async insertSyncInfo(id, updates, syncTimestamp) {
         await db_1.default.tryCatchInTransaction(async () => {
             const schema = db_1.default.getTenantSchemaPrefix();
             if (isNode()) {
-                await db_1.default.query(`insert into ${schema}"${db_1.default.sqlsanitize(this.name)}_sync_info" values($1,
-        date_trunc('milliseconds', to_timestamp($2)))`, [
-                    id,
-                    (syncTimestamp ? syncTimestamp : await db_1.default.time()).valueOf() /
-                        1000.0,
-                ]);
+                const timestamp = syncTimestamp ? syncTimestamp : await db_1.default.time();
+                const fieldTimestamps = {};
+                for (const k of Object.keys(updates).filter((key) => key !== this.pk_name)) {
+                    fieldTimestamps[k] = timestamp;
+                }
+                await db_1.default.query(`insert into ${schema}"${db_1.default.sqlsanitize(this.name)}_sync_info" (ref, last_modified, updated_fields)
+            values(
+              $1,
+              date_trunc('milliseconds', to_timestamp($2)),
+              $3::jsonb
+            )`, [id, timestamp.valueOf() / 1000.0, JSON.stringify(fieldTimestamps)]);
             }
             else {
                 await db_1.default.query(`insert into "${db_1.default.sqlsanitize(this.name)}_sync_info"
@@ -1440,15 +1462,28 @@ class Table {
                 .log(2, `Error in insertSyncInfo: ${e.message}`);
         });
     }
-    async updateSyncInfo(id, oldLastModified, syncTimestamp) {
+    async updateSyncInfo(id, v, oldLastModified, syncTimestamp) {
         await db_1.default.tryCatchInTransaction(async () => {
             const schema = db_1.default.getTenantSchemaPrefix();
             if (!db_1.default.isSQLite) {
-                await db_1.default.query(`update ${schema}"${db_1.default.sqlsanitize(this.name)}_sync_info" set last_modified=date_trunc('milliseconds', to_timestamp($1)) where ref=$2 and last_modified = to_timestamp($3)`, [
-                    (syncTimestamp ? syncTimestamp : await db_1.default.time()).valueOf() /
-                        1000.0,
+                const timestamp = syncTimestamp
+                    ? new Date(syncTimestamp)
+                    : await db_1.default.time();
+                const fieldTimestamps = {};
+                for (const k of Object.keys(v).filter((key) => key !== this.pk_name)) {
+                    fieldTimestamps[k] = timestamp;
+                }
+                await db_1.default.query(`update ${schema}"${db_1.default.sqlsanitize(this.name)}_sync_info" 
+            set 
+              last_modified=date_trunc('milliseconds', to_timestamp($1)),
+              updated_fields =
+                coalesce(updated_fields, '{}'::jsonb) || $4::jsonb
+            where 
+              ref=$2 and last_modified = to_timestamp($3)`, [
+                    timestamp.valueOf() / 1000.0,
                     id,
                     oldLastModified.valueOf() / 1000.0,
+                    JSON.stringify(fieldTimestamps),
                 ]);
             }
             else {
@@ -1706,9 +1741,11 @@ class Table {
         if (this.has_sync_info) {
             await db_1.default.tryCatchInTransaction(async () => {
                 if (isNode()) {
+                    // sync_info for insert
                     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() /
+              (ref, last_modified) values(
+              ${id}, date_trunc('milliseconds', to_timestamp(${(syncTimestamp ? syncTimestamp : await db_1.default.time()).valueOf() /
                         1000.0})))`);
                 }
                 else {
@@ -2018,7 +2055,11 @@ class Table {
             if (!pk) {
                 throw new Error("Unable to find a field with a primary key.");
             }
-            await db_1.default.query(`create table ${schemaPrefix}"${(0, internal_1.sqlsanitize)(this.name)}_sync_info" (ref integer, last_modified timestamp, deleted boolean default false)`);
+            await db_1.default.query(`create table ${schemaPrefix}"${(0, internal_1.sqlsanitize)(this.name)}_sync_info" (
+            ref integer,
+            last_modified timestamp,
+            deleted boolean default false,
+            updated_fields jsonb)`);
             await db_1.default.query(`create index "${(0, internal_1.sqlsanitize)(this.name)}_sync_info_ref_index" on ${schemaPrefix}"${(0, internal_1.sqlsanitize)(this.name)}_sync_info"(ref)`);
             await db_1.default.query(`create index "${(0, internal_1.sqlsanitize)(this.name)}_sync_info_lm_index" on ${schemaPrefix}"${(0, internal_1.sqlsanitize)(this.name)}_sync_info"(last_modified)`);
             await db_1.default.query(`create index "${(0, internal_1.sqlsanitize)(this.name)}_sync_info_deleted_index" on ${schemaPrefix}"${(0, internal_1.sqlsanitize)(this.name)}_sync_info"(deleted)`);