schemadiff: allow char->varchar FK reference type matching (#14849)

Signed-off-by: Shlomi Noach <2607934+shlomi-noach@users.noreply.github.com>
vitessio · Dec 22, 2023 · d807985 · d807985
1 parent 3a3e7ea
commit d807985
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/go/vt/schemadiff/schema.go b/go/vt/schemadiff/schema.go
@@ -357,6 +357,9 @@ func (s *Schema) normalize() error {
 		if child.Type == "char" && parent.Type == "varchar" {
 			return true
 		}
+		if child.Type == "varchar" && parent.Type == "char" {
+			return true
+		}
 		return false
 	}
 	colTypeEqualForForeignKey := func(child, parent *sqlparser.ColumnType) bool {

diff --git a/go/vt/schemadiff/schema_test.go b/go/vt/schemadiff/schema_test.go
@@ -383,13 +383,12 @@ func TestInvalidSchema(t *testing.T) {
 			schema: "create table t10(id varchar(50) charset utf8mb4 collate utf8mb4_0900_ai_ci primary key); create table t11 (id int primary key, i varchar(100) charset utf8mb4 collate utf8mb4_0900_ai_ci, key ix(i), constraint f10 foreign key (i) references t10(id) on delete restrict)",
 		},
 		{
-			// weirdly allowed: varchar->char
+			// allowed: varchar->char
 			schema: "create table t10(id varchar(50) charset utf8mb4 collate utf8mb4_0900_ai_ci primary key); create table t11 (id int primary key, i char(100) charset utf8mb4 collate utf8mb4_0900_ai_ci, key ix(i), constraint f10 foreign key (i) references t10(id) on delete restrict)",
 		},
 		{
-			// but weirdly not allowed: char->varchar
-			schema:    "create table t10(id char(50) charset utf8mb4 collate utf8mb4_0900_ai_ci primary key); create table t11 (id int primary key, i varchar(50) charset utf8mb4 collate utf8mb4_0900_ai_ci, key ix(i), constraint f10 foreign key (i) references t10(id) on delete restrict)",
-			expectErr: &ForeignKeyColumnTypeMismatchError{Table: "t11", Constraint: "f10", Column: "i", ReferencedTable: "t10", ReferencedColumn: "id"},
+			// allowed: char->varchar
+			schema: "create table t10(id char(50) charset utf8mb4 collate utf8mb4_0900_ai_ci primary key); create table t11 (id int primary key, i varchar(50) charset utf8mb4 collate utf8mb4_0900_ai_ci, key ix(i), constraint f10 foreign key (i) references t10(id) on delete restrict)",
 		},
 		{
 			schema:    "create table t10(id varchar(50) charset utf8mb3 primary key); create table t11 (id int primary key, i varchar(100) charset utf8mb4, key ix(i), constraint f10 foreign key (i) references t10(id) on delete restrict)",