Merge remote-tracking branch 'origin/main' into stable

PeerDB-io · Sep 10, 2024 · 6918fc2 · 6918fc2
2 parents 04994ce + a5a4707
commit 6918fc2
Showing 1 changed file with 10 additions and 5 deletions.
diff --git a/flow/connectors/clickhouse/normalize.go b/flow/connectors/clickhouse/normalize.go
@@ -153,7 +153,9 @@ func generateCreateTableSQLForNormalizedTable(
 	}
 
 	var engine string
-	if tableMapping == nil || tableMapping.Engine == protos.TableEngine_CH_ENGINE_MERGE_TREE {
+	if tableMapping == nil {
+		engine = fmt.Sprintf("ReplacingMergeTree(`%s`)", versionColName)
+	} else if tableMapping.Engine == protos.TableEngine_CH_ENGINE_MERGE_TREE {
 		engine = "MergeTree()"
 	} else {
 		engine = fmt.Sprintf("ReplacingMergeTree(`%s`)", versionColName)
@@ -180,10 +182,13 @@ func generateCreateTableSQLForNormalizedTable(
 		stmtBuilder.WriteString(") ")
 	}
 
-	orderby := make([]*protos.ColumnSetting, 0, len(tableMapping.Columns))
-	for _, col := range tableMapping.Columns {
-		if col.Ordering > 0 && !slices.Contains(pkeys, getColName(colNameMap, col.SourceName)) {
-			orderby = append(orderby, col)
+	orderby := make([]*protos.ColumnSetting, 0)
+	if tableMapping != nil {
+		orderby = slices.Clone(tableMapping.Columns)
+		for _, col := range tableMapping.Columns {
+			if col.Ordering > 0 && !slices.Contains(pkeys, getColName(colNameMap, col.SourceName)) {
+				orderby = append(orderby, col)
+			}
 		}
 	}
 	slices.SortStableFunc(orderby, func(a *protos.ColumnSetting, b *protos.ColumnSetting) int {