Merge pull request #25 from cuihom/main

alecgibson · web-flow · commit 487b2897539d · 2024-10-18T10:39:20.000+01:00
Fix snapshot commit metadata on conflict
diff --git a/index.js b/index.js
@@ -80,7 +80,7 @@ PostgresDB.prototype.commit = async function(collection, id, op, snapshot, optio
     WHERE collection = $1 AND doc_id = $2
     FOR UPDATE
   )
-  ON CONFLICT (collection, doc_id) DO UPDATE SET version = $3, data = $5, doc_type = $4, metadata = $5
+  ON CONFLICT (collection, doc_id) DO UPDATE SET version = $3, data = $5, doc_type = $4, metadata = $6
   RETURNING version
 )
 INSERT INTO ops (collection, doc_id, version, operation)

Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ PostgresDB.prototype.commit = async function(collection, id, op, snapshot, optio`
`80`	`80`	`WHERE collection = $1 AND doc_id = $2`
`81`	`81`	`FOR UPDATE`
`82`	`82`	`)`
`83`		`- ON CONFLICT (collection, doc_id) DO UPDATE SET version = $3, data = $5, doc_type = $4, metadata = $5`
	`83`	`+ ON CONFLICT (collection, doc_id) DO UPDATE SET version = $3, data = $5, doc_type = $4, metadata = $6`
`84`	`84`	`RETURNING version`
`85`	`85`	`)`
`86`	`86`	`INSERT INTO ops (collection, doc_id, version, operation)`