Merge pull request #438 from tdakkota/fix/column-type-regression

fix(proto): properly handle `Enum8` and `Enum8(...)` in conflicts checker
ClickHouse · Oct 22, 2024 · f90daaf · f90daaf
2 parents abd6ab7 + 958bcc8
commit f90daaf
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/proto/column.go b/proto/column.go
@@ -127,9 +127,15 @@ func (c ColumnType) Conflicts(b ColumnType) bool {
 	if cBase == ColumnTypeDecimal || bBase == ColumnTypeDecimal {
 		return c.decimalDowncast() != b.decimalDowncast()
 	}
+
 	if cBase != bBase {
 		return true
 	}
+	switch cBase {
+	case ColumnTypeEnum8, ColumnTypeEnum16:
+		return false
+	}
+
 	if c.normalizeCommas() == b.normalizeCommas() {
 		return false
 	}

diff --git a/proto/column_test.go b/proto/column_test.go
@@ -60,6 +60,8 @@ func TestColumnType_Elem(t *testing.T) {
 				{A: "Map(String,String)", B: "Map(String, String)"},
 				{A: "Enum8('increment' = 1, 'gauge' = 2)", B: "Int8"},
 				{A: "Int8", B: "Enum8('increment' = 1, 'gauge' = 2)"},
+				{A: "Enum8('increment' = 1, 'gauge' = 2)", B: "Enum8"},
+				{A: "Enum8", B: "Enum8('increment' = 1, 'gauge' = 2)"},
 				{A: "Decimal256", B: "Decimal(76, 38)"},
 				{A: "Nullable(Decimal256)", B: "Nullable(Decimal(76, 38))"},
 			} {