From f78bec3e74fee0fa2eab82651ef6de6a1a384e8d Mon Sep 17 00:00:00 2001
From: Amogh-Bharadwaj <amogh@peerdb.io>
Date: Thu, 21 Dec 2023 19:54:07 +0530
Subject: [PATCH] fix bq merge tests

---
 .../bigquery/merge_stmt_generator_test.go     | 50 +++++++++++--------
 1 file changed, 30 insertions(+), 20 deletions(-)

diff --git a/flow/connectors/bigquery/merge_stmt_generator_test.go b/flow/connectors/bigquery/merge_stmt_generator_test.go
index 47705167d6..37dd3e07ed 100644
--- a/flow/connectors/bigquery/merge_stmt_generator_test.go
+++ b/flow/connectors/bigquery/merge_stmt_generator_test.go
@@ -14,25 +14,31 @@ func TestGenerateUpdateStatement_WithUnchangedToastCols(t *testing.T) {
 	unchangedToastCols := []string{"", "col2, col3", "col2", "col3"}
 
 	expected := []string{
-		"WHEN MATCHED AND (_peerdb_deduped._peerdb_record_type != 2)" +
-			" AND _peerdb_unchanged_toast_columns='' " +
-			"THEN UPDATE SET `col1` = _peerdb_deduped.col1," +
-			" `col2` = _peerdb_deduped.col2," +
-			" `col3` = _peerdb_deduped.col3," +
-			"`synced_at`=CURRENT_TIMESTAMP," + "`deleted`=FALSE",
-		"WHEN MATCHED AND (_peerdb_deduped._peerdb_record_type != 2)" +
-			" AND _peerdb_unchanged_toast_columns='col2, col3' " +
-			"THEN UPDATE SET `col1` = _peerdb_deduped.col1," +
-			"`synced_at`=CURRENT_TIMESTAMP," + "`deleted`=FALSE",
-		"WHEN MATCHED AND (_peerdb_deduped._peerdb_record_type != 2)" +
-			" AND _peerdb_unchanged_toast_columns='col2'" +
-			"THEN UPDATE SET `col1` = _peerdb_deduped.col1," +
-			" `col3` = _peerdb_deduped.col3," +
-			"`synced_at`=CURRENT_TIMESTAMP," + "`deleted`=FALSE",
-		"WHEN MATCHED AND (_peerdb_deduped._peerdb_record_type != 2)" +
-			" AND _peerdb_unchanged_toast_columns='col3'" +
-			"THEN UPDATE SET `col1` = _peerdb_deduped.col1," +
-			" `col2` = _peerdb_deduped.col2," + "`synced_at`=CURRENT_TIMESTAMP," + "`deleted`=FALSE",
+		"WHEN MATCHED AND (_peerdb_deduped._peerdb_record_type!=2) AND _peerdb_unchanged_toast_columns=''" +
+			" THEN UPDATE SET `col1`=_peerdb_deduped.col1,`col2`=_peerdb_deduped.col2,`col3`=_peerdb_deduped.col3," +
+			"`synced_at`=CURRENT_TIMESTAMP,`deleted`=FALSE",
+		"WHEN MATCHED AND (_peerdb_deduped._peerdb_record_type=2) " +
+			"AND _peerdb_unchanged_toast_columns='' " +
+			"THEN UPDATE SET `col1`=_peerdb_deduped.col1,`col2`=_peerdb_deduped.col2," +
+			"`col3`=_peerdb_deduped.col3,`synced_at`=CURRENT_TIMESTAMP,`deleted`=TRUE",
+		"WHEN MATCHED AND (_peerdb_deduped._peerdb_record_type!=2) AND _peerdb_unchanged_toast_columns='col2,col3' " +
+			"THEN UPDATE SET `col1`=_peerdb_deduped.col1,`synced_at`=CURRENT_TIMESTAMP,`deleted`=FALSE ",
+		"WHEN MATCHED AND (_peerdb_deduped._peerdb_record_type=2) AND _peerdb_unchanged_toast_columns='col2,col3' " +
+			"THEN UPDATE SET `col1`=_peerdb_deduped.col1,`synced_at`=CURRENT_TIMESTAMP,`deleted`=TRUE",
+		"WHEN MATCHED AND (_peerdb_deduped._peerdb_record_type!=2) " +
+			"AND _peerdb_unchanged_toast_columns='col2' " +
+			"THEN UPDATE SET `col1`=_peerdb_deduped.col1,`col3`=_peerdb_deduped.col3," +
+			"`synced_at`=CURRENT_TIMESTAMP,`deleted`=FALSE",
+		"WHEN MATCHED AND(_peerdb_deduped._peerdb_record_type=2) " +
+			"AND _peerdb_unchanged_toast_columns='col2' " +
+			"THEN UPDATE SET `col1`=_peerdb_deduped.col1,`col3`=_peerdb_deduped.col3," +
+			"`synced_at`=CURRENT_TIMESTAMP,`deleted`=TRUE ",
+		"WHEN MATCHED AND (_peerdb_deduped._peerdb_record_type!=2) AND _peerdb_unchanged_toast_columns='col3' " +
+			"THEN UPDATE SET `col1`=_peerdb_deduped.col1," +
+			"`col2`=_peerdb_deduped.col2,`synced_at`=CURRENT_TIMESTAMP,`deleted`=FALSE ",
+		"WHEN MATCHED AND (_peerdb_deduped._peerdb_record_type=2) AND _peerdb_unchanged_toast_columns='col3' " +
+			"THEN UPDATE SET `col1`=_peerdb_deduped.col1," +
+			"`col2`=_peerdb_deduped.col2,`synced_at`=CURRENT_TIMESTAMP,`deleted`=TRUE",
 	}
 
 	result := m.generateUpdateStatements(allCols, unchangedToastCols, &protos.PeerDBColumns{
@@ -47,7 +53,7 @@ func TestGenerateUpdateStatement_WithUnchangedToastCols(t *testing.T) {
 	}
 
 	if !reflect.DeepEqual(result, expected) {
-		t.Errorf("Unexpected result. Expected: %v, but got: %v", expected, result)
+		t.Errorf("Unexpected result. Expected: %v,\nbut got: %v", expected, result)
 	}
 }
 
@@ -65,6 +71,10 @@ func TestGenerateUpdateStatement_NoUnchangedToastCols(t *testing.T) {
 			" `col3` = _peerdb_deduped.col3," +
 			" `synced_at`=CURRENT_TIMESTAMP," +
 			"`deleted`=FALSE",
+		"WHEN MATCHED AND" +
+			"(_peerdb_deduped._peerdb_record_type = 2) AND _peerdb_unchanged_toast_columns=''" +
+			"THEN UPDATE SET `col1` = _peerdb_deduped.col1, `col2` = _peerdb_deduped.col2, " +
+			"`col3` = _peerdb_deduped.col3, `synced_at` = CURRENT_TIMESTAMP, `deleted` = TRUE",
 	}
 
 	result := m.generateUpdateStatements(allCols, unchangedToastCols,