From f8ee7df4caa9d8756587e7e4af3af3aacb7f8645 Mon Sep 17 00:00:00 2001 From: Nick Tobey Date: Thu, 7 Dec 2023 22:01:47 -0800 Subject: [PATCH] Add test that charset changes are not compatible for automatic merge resolution. --- go/libraries/doltcore/merge/type_compatibility_test.go | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/go/libraries/doltcore/merge/type_compatibility_test.go b/go/libraries/doltcore/merge/type_compatibility_test.go index b0f1a17b73..79cc1e8e58 100644 --- a/go/libraries/doltcore/merge/type_compatibility_test.go +++ b/go/libraries/doltcore/merge/type_compatibility_test.go @@ -57,6 +57,7 @@ var point = typeinfo.CreatePointTypeFromSqlPointType(gmstypes.PointType{SRID: ui var varchar10 = typeinfo.CreateVarStringTypeFromSqlType(gmstypes.MustCreateString(sqltypes.VarChar, 10, sql.Collation_Default)) var varchar10ci = typeinfo.CreateVarStringTypeFromSqlType(gmstypes.MustCreateString(sqltypes.VarChar, 10, sql.Collation_utf8mb4_0900_ai_ci)) var varchar10bin = typeinfo.CreateVarStringTypeFromSqlType(gmstypes.MustCreateString(sqltypes.VarChar, 10, sql.Collation_utf8mb4_0900_bin)) +var varchar10utf16bin = typeinfo.CreateVarStringTypeFromSqlType(gmstypes.MustCreateString(sqltypes.VarChar, 10, sql.Collation_utf16_bin)) var varchar20 = typeinfo.CreateVarStringTypeFromSqlType(gmstypes.MustCreateString(sqltypes.VarChar, 20, sql.Collation_Default)) var varchar300 = typeinfo.CreateVarStringTypeFromSqlType(gmstypes.MustCreateString(sqltypes.VarChar, 300, sql.Collation_Default)) var varchar10BinaryCollation = typeinfo.CreateVarStringTypeFromSqlType(gmstypes.MustCreateString(sqltypes.VarChar, 10, sql.Collation_binary)) @@ -203,6 +204,14 @@ func TestDoltIsTypeChangeCompatible(t *testing.T) { compatible: false, }, + // Charset changes + { + name: "incompatible: VARCHAR(10) charset change", + from: varchar10bin, + to: varchar10utf16bin, + compatible: false, + }, + // Collation changes { name: "compatible: VARCHAR(10) collation change",