Merge branch 'main' into simpler-times

PeerDB-io · Mar 18, 2024 · 07cc0e6 · 07cc0e6
2 parents 5f2dfde + ed7d05e
commit 07cc0e6
Show file tree

Hide file tree

Showing 3 changed files with 2,637 additions and 2,058 deletions.
diff --git a/flow/connectors/bigquery/bigquery.go b/flow/connectors/bigquery/bigquery.go
@@ -494,7 +494,7 @@ func (c *BigQueryConnector) NormalizeRecords(ctx context.Context, req *model.Nor
 				SoftDelete:        req.SoftDelete,
 			})
 		if mergeErr != nil {
-			return nil, err
+			return nil, mergeErr
 		}
 
 		err = c.pgMetadata.UpdateNormalizeBatchID(ctx, req.FlowJobName, batchId)