test(postgresql): improved tests

Author: andinux

test/postgresql/01_unittest.sql

@@ -1,7 +1,9 @@
 -- '2 db roundtrip test'
 
-\echo '\nRunning two-db roundtrip test ...'
+\set testid '02'
+
 \connect cloudsync_test_1
+\ir helper_psql_conn_setup.sql
 SELECT encode(cloudsync_payload_encode(tbl, pk, col_name, col_value, col_version, db_version, site_id, cl, seq), 'hex') AS payload_hex
 FROM cloudsync_changes
 WHERE site_id = cloudsync_siteid() \gset
@@ -19,8 +21,8 @@ SELECT md5(COALESCE(string_agg(id || ':' || COALESCE(val, ''), ',' ORDER BY id),
 FROM smoke_tbl \gset
 SELECT (:'smoke_hash' = :'smoke_hash_b') AS payload_roundtrip_ok \gset
 \if :payload_roundtrip_ok
-\echo '[PASS] Test payload roundtrip to another database'
+\echo [PASS] (:testid) Test payload roundtrip to another database
 \else
-\echo '[FAIL] Test payload roundtrip to another database'
+\echo [FAIL] (:testid) Test payload roundtrip to another database
 SELECT (:fail::int + 1) AS fail \gset
 \endif

test/postgresql/02_roundtrip.sql

@@ -1,6 +1,7 @@
 -- 'Test multi-db roundtrip with concurrent updates'
 
-\echo '\nRunning multi-db roundtrip with concurrent updates ...'
+\set testid '03' 
+
 \connect postgres
 \ir helper_psql_conn_setup.sql
 DROP DATABASE IF EXISTS cloudsync_test_a;
@@ -285,8 +286,8 @@ FROM smoke_tbl \gset
 
 SELECT (:'smoke_hash_a' = :'smoke_hash_b' AND :'smoke_hash_a' = :'smoke_hash_c') AS multi_db_roundtrip_ok \gset
 \if :multi_db_roundtrip_ok
-\echo '[PASS] Test multi-db roundtrip with concurrent updates'
+\echo [PASS] (:testid) Test multi-db roundtrip with concurrent updates
 \else
-\echo '[FAIL] Test multi-db roundtrip with concurrent updates'
+\echo [FAIL] (:testid) Test multi-db roundtrip with concurrent updates
 SELECT (:fail::int + 1) AS fail \gset
 \endif

test/postgresql/03_multiple_roundtrip.sql

@@ -2,7 +2,8 @@
 --   - concurrent update pattern where A/B/C perform 2/1/3 updates respectively on id1 before syncing. 
 --   - It follows the same apply order as the existing 3‑DB test and verifies final convergence across all three databases
 
-\echo '\nRunning multi-db roundtrip with skewed col_version updates ...'
+\set testid '04'
+
 \connect postgres
 \ir helper_psql_conn_setup.sql
 DROP DATABASE IF EXISTS cloudsync_test_a;
@@ -308,8 +309,8 @@ FROM smoke_tbl \gset
 
 SELECT (:'smoke_hash_a' = :'smoke_hash_b' AND :'smoke_hash_a' = :'smoke_hash_c') AS multi_db_roundtrip_ok \gset
 \if :multi_db_roundtrip_ok
-\echo '[PASS] Test multi-db roundtrip with skewed col_version updates'
+\echo [PASS] (:testid) Test multi-db roundtrip with skewed col_version updates
 \else
-\echo '[FAIL] Test multi-db roundtrip with skewed col_version updates'
+\echo [FAIL] (:testid) Test multi-db roundtrip with skewed col_version updates
 SELECT (:fail::int + 1) AS fail \gset
 \endif

test/postgresql/04_colversion_skew.sql

@@ -7,7 +7,8 @@
 --   6. C reinserts with another value
 
 
-\echo '\nRunning delete/recreate/update/delete/reinsert cycle across multiple DBs ...'
+\set testid '05'
+
 \connect postgres
 \ir helper_psql_conn_setup.sql
 DROP DATABASE IF EXISTS cloudsync_test_a;
@@ -767,8 +768,8 @@ FROM smoke_tbl \gset
 
 SELECT (:'smoke_hash_a' = :'smoke_hash_b' AND :'smoke_hash_a' = :'smoke_hash_c') AS multi_db_roundtrip_ok \gset
 \if :multi_db_roundtrip_ok
-\echo '[PASS] Test delete/recreate/update/delete/reinsert cycle'
+\echo [PASS] (:testid) Test delete/recreate/update/delete/reinsert cycle
 \else
-\echo '[FAIL] Test delete/recreate/update/delete/reinsert cycle'
+\echo [FAIL] (:testid) Test delete/recreate/update/delete/reinsert cycle
 SELECT (:fail::int + 1) AS fail \gset
 \endif

test/postgresql/05_delete_recreate_cycle.sql

@@ -4,7 +4,8 @@
 --   - Applies round3 before round2 on C, while A/B apply round2 then round3
 --   - Verifies convergence across all three DBs
 
-\echo '\nRunning out-of-order payload delivery across multiple DBs test ...'
+\set testid '06'
+
 \connect postgres
 \ir helper_psql_conn_setup.sql
 DROP DATABASE IF EXISTS cloudsync_test_a;
@@ -271,8 +272,8 @@ FROM smoke_tbl \gset
 
 SELECT (:'smoke_hash_a' = :'smoke_hash_b' AND :'smoke_hash_a' = :'smoke_hash_c') AS multi_db_roundtrip_ok \gset
 \if :multi_db_roundtrip_ok
-\echo '[PASS] Test out-of-order payload delivery'
+\echo [PASS] (:testid) Test out-of-order payload delivery
 \else
-\echo '[FAIL] Test out-of-order payload delivery'
+\echo [FAIL] (:testid) Test out-of-order payload delivery
 SELECT (:fail::int + 1) AS fail \gset
 \endif

test/postgresql/06_out_of_order_delivery.sql

@@ -4,7 +4,8 @@
 -- 2) B deletes id1 while C updates id1, then sync
 -- 3) A updates id1 after merge, then sync
 
-\echo '\nRunning concurrent delete vs update test ...'
+\set testid '07'
+
 \connect postgres
 \ir helper_psql_conn_setup.sql
 DROP DATABASE IF EXISTS cloudsync_test_a;
@@ -273,8 +274,8 @@ FROM smoke_tbl \gset
 
 SELECT (:'smoke_hash_a' = :'smoke_hash_b' AND :'smoke_hash_a' = :'smoke_hash_c') AS multi_db_roundtrip_ok \gset
 \if :multi_db_roundtrip_ok
-\echo '[PASS] Concurrent delete vs update'
+\echo [PASS] (:testid) Concurrent delete vs update
 \else
-\echo '[FAIL] Concurrent delete vs update'
+\echo [FAIL] (:testid) Concurrent delete vs update
 SELECT (:fail::int + 1) AS fail \gset
 \endif

test/postgresql/07_delete_vs_update.sql

@@ -6,7 +6,8 @@
 -- 4) Apply delayed delete payload from A to B/C
 -- 5) Verify convergence
 
-\echo '\nRunning resurrect after delete with delayed payload test ...'
+\set testid '08'
+
 \connect postgres
 \ir helper_psql_conn_setup.sql
 DROP DATABASE IF EXISTS cloudsync_test_a;
@@ -39,6 +40,9 @@ SELECT cloudsync_init('smoke_tbl', 'CLS', true) AS _init_site_id_c \gset
 
 -- Round 1: seed id1 on A, sync to B/C
 \connect cloudsync_test_a
+\if :{?DEBUG_MERGE}
+\echo '[INFO] cloudsync_test_a INSERT id1=seed_v1'
+\endif
 INSERT INTO smoke_tbl VALUES ('id1', 'seed_v1');
 SELECT CASE WHEN payload IS NULL OR octet_length(payload) = 0
             THEN ''
@@ -76,43 +80,88 @@ FROM (
 ) AS p \gset
 
 \connect cloudsync_test_a
+\if :{?DEBUG_MERGE}
+\echo '[INFO] round1 before merge cloudsync_test_a smoke_tbl'
+SELECT * FROM smoke_tbl ORDER BY id;
+\endif
 \if :payload_b_r1_ok
+\if :{?DEBUG_MERGE}
+\echo '[MERGE] round1 apply b -> a'
+\endif
 SELECT cloudsync_payload_apply(decode(substr(:'payload_b_r1', 3), 'hex')) AS _apply_a_r1_b \gset
 \else
 SELECT 0 AS _apply_a_r1_b \gset
 \endif
 \if :payload_c_r1_ok
+\if :{?DEBUG_MERGE}
+\echo '[MERGE] round1 apply c -> a'
+\endif
 SELECT cloudsync_payload_apply(decode(substr(:'payload_c_r1', 3), 'hex')) AS _apply_a_r1_c \gset
 \else
 SELECT 0 AS _apply_a_r1_c \gset
 \endif
+\if :{?DEBUG_MERGE}
+\echo '[INFO] round1 after merge cloudsync_test_a smoke_tbl'
+SELECT * FROM smoke_tbl ORDER BY id;
+\endif
 
 \connect cloudsync_test_b
+\if :{?DEBUG_MERGE}
+\echo '[INFO] round1 before merge cloudsync_test_b smoke_tbl'
+SELECT * FROM smoke_tbl ORDER BY id;
+\endif
 \if :payload_a_r1_ok
+\if :{?DEBUG_MERGE}
+\echo '[MERGE] round1 apply a -> b'
+\endif
 SELECT cloudsync_payload_apply(decode(substr(:'payload_a_r1', 3), 'hex')) AS _apply_b_r1_a \gset
 \else
 SELECT 0 AS _apply_b_r1_a \gset
 \endif
 \if :payload_c_r1_ok
+\if :{?DEBUG_MERGE}
+\echo '[MERGE] round1 apply c -> b'
+\endif
 SELECT cloudsync_payload_apply(decode(substr(:'payload_c_r1', 3), 'hex')) AS _apply_b_r1_c \gset
 \else
 SELECT 0 AS _apply_b_r1_c \gset
 \endif
+\if :{?DEBUG_MERGE}
+\echo '[INFO] round1 after merge cloudsync_test_b smoke_tbl'
+SELECT * FROM smoke_tbl ORDER BY id;
+\endif
 
 \connect cloudsync_test_c
+\if :{?DEBUG_MERGE}
+\echo '[INFO] round1 before merge cloudsync_test_c smoke_tbl'
+SELECT * FROM smoke_tbl ORDER BY id;
+\endif
 \if :payload_a_r1_ok
+\if :{?DEBUG_MERGE}
+\echo '[MERGE] round1 apply a -> c'
+\endif
 SELECT cloudsync_payload_apply(decode(substr(:'payload_a_r1', 3), 'hex')) AS _apply_c_r1_a \gset
 \else
 SELECT 0 AS _apply_c_r1_a \gset
 \endif
 \if :payload_b_r1_ok
+\if :{?DEBUG_MERGE}
+\echo '[MERGE] round1 apply b -> c'
+\endif
 SELECT cloudsync_payload_apply(decode(substr(:'payload_b_r1', 3), 'hex')) AS _apply_c_r1_b \gset
 \else
 SELECT 0 AS _apply_c_r1_b \gset
 \endif
+\if :{?DEBUG_MERGE}
+\echo '[INFO] round1 after merge cloudsync_test_c smoke_tbl'
+SELECT * FROM smoke_tbl ORDER BY id;
+\endif
 
 -- Round 2: A deletes id1 (payload delayed for B/C)
 \connect cloudsync_test_a
+\if :{?DEBUG_MERGE}
+\echo '[INFO] cloudsync_test_a DELETE id1'
+\endif
 DELETE FROM smoke_tbl WHERE id = 'id1';
 SELECT CASE WHEN payload IS NULL OR octet_length(payload) = 0
             THEN ''
@@ -127,7 +176,12 @@ FROM (
 
 -- Round 3: B recreates id1, sync to A/C (but A's delete still not applied on B/C)
 \connect cloudsync_test_b
-INSERT INTO smoke_tbl VALUES ('id1', 'recreate_v2');
+\if :{?DEBUG_MERGE}
+\echo '[INFO] cloudsync_test_b UPSERT id1=recreate_v2'
+\endif
+INSERT INTO smoke_tbl (id, val)
+VALUES ('id1', 'recreate_v2')
+ON CONFLICT (id) DO UPDATE SET val = EXCLUDED.val;
 SELECT CASE WHEN payload IS NULL OR octet_length(payload) = 0
             THEN ''
             ELSE '\x' || encode(payload, 'hex')
@@ -164,55 +218,119 @@ FROM (
 ) AS p \gset
 
 \connect cloudsync_test_a
+\if :{?DEBUG_MERGE}
+\echo '[INFO] round3 before merge cloudsync_test_a smoke_tbl'
+SELECT * FROM smoke_tbl ORDER BY id;
+\endif
 \if :payload_b_r3_ok
+\if :{?DEBUG_MERGE}
+\echo '[MERGE] round3 apply b -> a'
+\endif
 SELECT cloudsync_payload_apply(decode(substr(:'payload_b_r3', 3), 'hex')) AS _apply_a_r3_b \gset
 \else
 SELECT 0 AS _apply_a_r3_b \gset
 \endif
 \if :payload_c_r3_ok
+\if :{?DEBUG_MERGE}
+\echo '[MERGE] round3 apply c -> a'
+\endif
 SELECT cloudsync_payload_apply(decode(substr(:'payload_c_r3', 3), 'hex')) AS _apply_a_r3_c \gset
 \else
 SELECT 0 AS _apply_a_r3_c \gset
 \endif
+\if :{?DEBUG_MERGE}
+\echo '[INFO] round3 after merge cloudsync_test_a smoke_tbl'
+SELECT * FROM smoke_tbl ORDER BY id;
+\endif
 
 \connect cloudsync_test_b
+\if :{?DEBUG_MERGE}
+\echo '[INFO] round3 before merge cloudsync_test_b smoke_tbl'
+SELECT * FROM smoke_tbl ORDER BY id;
+\endif
 \if :payload_a_r3_ok
+\if :{?DEBUG_MERGE}
+\echo '[MERGE] round3 apply a -> b'
+\endif
 SELECT cloudsync_payload_apply(decode(substr(:'payload_a_r3', 3), 'hex')) AS _apply_b_r3_a \gset
 \else
 SELECT 0 AS _apply_b_r3_a \gset
 \endif
 \if :payload_c_r3_ok
+\if :{?DEBUG_MERGE}
+\echo '[MERGE] round3 apply c -> b'
+\endif
 SELECT cloudsync_payload_apply(decode(substr(:'payload_c_r3', 3), 'hex')) AS _apply_b_r3_c \gset
 \else
 SELECT 0 AS _apply_b_r3_c \gset
 \endif
+\if :{?DEBUG_MERGE}
+\echo '[INFO] round3 after merge cloudsync_test_b smoke_tbl'
+SELECT * FROM smoke_tbl ORDER BY id;
+\endif
 
 \connect cloudsync_test_c
+\if :{?DEBUG_MERGE}
+\echo '[INFO] round3 before merge cloudsync_test_c smoke_tbl'
+SELECT * FROM smoke_tbl ORDER BY id;
+\endif
 \if :payload_a_r3_ok
+\if :{?DEBUG_MERGE}
+\echo '[MERGE] round3 apply a -> c'
+\endif
 SELECT cloudsync_payload_apply(decode(substr(:'payload_a_r3', 3), 'hex')) AS _apply_c_r3_a \gset
 \else
 SELECT 0 AS _apply_c_r3_a \gset
 \endif
 \if :payload_b_r3_ok
+\if :{?DEBUG_MERGE}
+\echo '[MERGE] round3 apply b -> c'
+\endif
 SELECT cloudsync_payload_apply(decode(substr(:'payload_b_r3', 3), 'hex')) AS _apply_c_r3_b \gset
 \else
 SELECT 0 AS _apply_c_r3_b \gset
 \endif
+\if :{?DEBUG_MERGE}
+\echo '[INFO] round3 after merge cloudsync_test_c smoke_tbl'
+SELECT * FROM smoke_tbl ORDER BY id;
+\endif
 
 -- Round 4: apply delayed delete payload from A to B/C
 \connect cloudsync_test_b
+\if :{?DEBUG_MERGE}
+\echo '[INFO] round4 before merge cloudsync_test_b smoke_tbl'
+SELECT * FROM smoke_tbl ORDER BY id;
+\endif
 \if :payload_a_r2_ok
+\if :{?DEBUG_MERGE}
+\echo '[MERGE] round4 apply delayed a -> b'
+\endif
 SELECT cloudsync_payload_apply(decode(substr(:'payload_a_r2', 3), 'hex')) AS _apply_b_r4_a_delayed \gset
 \else
 SELECT 0 AS _apply_b_r4_a_delayed \gset
 \endif
+\if :{?DEBUG_MERGE}
+\echo '[INFO] round4 after merge cloudsync_test_b smoke_tbl'
+SELECT * FROM smoke_tbl ORDER BY id;
+\endif
 
 \connect cloudsync_test_c
+\if :{?DEBUG_MERGE}
+\echo '[INFO] round4 before merge cloudsync_test_c smoke_tbl'
+SELECT * FROM smoke_tbl ORDER BY id;
+\endif
 \if :payload_a_r2_ok
+\if :{?DEBUG_MERGE}
+\echo '[MERGE] round4 apply delayed a -> c'
+\endif
 SELECT cloudsync_payload_apply(decode(substr(:'payload_a_r2', 3), 'hex')) AS _apply_c_r4_a_delayed \gset
 \else
 SELECT 0 AS _apply_c_r4_a_delayed \gset
 \endif
+\if :{?DEBUG_MERGE}
+\echo '[INFO] round4 after merge cloudsync_test_c smoke_tbl'
+SELECT * FROM smoke_tbl ORDER BY id;
+\endif
 
 -- Final consistency check across all three databases
 \connect cloudsync_test_a
@@ -229,8 +347,8 @@ FROM smoke_tbl \gset
 
 SELECT (:'smoke_hash_a' = :'smoke_hash_b' AND :'smoke_hash_a' = :'smoke_hash_c') AS multi_db_roundtrip_ok \gset
 \if :multi_db_roundtrip_ok
-\echo '[PASS] Resurrect after delete with delayed payload'
+\echo [PASS] (:testid) Resurrect after delete with delayed payload
 \else
-\echo '[FAIL] Resurrect after delete with delayed payload'
+\echo [FAIL] (:testid) Resurrect after delete with delayed payload
 SELECT (:fail::int + 1) AS fail \gset
 \endif