feat: remove sql changes from schemacopy

Signed-off-by: Manan Gupta <[email protected]>
vitessio · Oct 23, 2024 · f98a73b · f98a73b
1 parent f2c9e0a
commit f98a73b
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 9 deletions.
diff --git a/go/vt/schemadiff/schema_diff_test.go b/go/vt/schemadiff/schema_diff_test.go
@@ -454,6 +454,18 @@ func TestSchemaDiff(t *testing.T) {
 			expectDeps:       1,
 			conflictingDiffs: 2,
 		},
+		{
+			name: "two identical tables, one with explicit charset, one without",
+			fromQueries: []string{
+				"create table t1 (id int primary key, foo varchar(64) character set utf8mb3 collate utf8mb3_bin)",
+			},
+			toQueries: []string{
+				"create table t1 (id int primary key, foo varchar(64) collate utf8mb3_bin)",
+			},
+			// This isn't strictly correct. We have a diff even though there shouldn't be one.
+			expectDiffs: 1,
+			entityOrder: []string{"t1"},
+		},
 
 		// FKs
 		{

diff --git a/go/vt/sidecardb/schema/schematracker/schemacopy.sql b/go/vt/sidecardb/schema/schematracker/schemacopy.sql
@@ -16,13 +16,13 @@ limitations under the License.
 
 CREATE TABLE IF NOT EXISTS schemacopy
 (
-    `table_schema`          varchar(64) CHARACTER SET utf8mb3 COLLATE utf8mb3_bin         NOT NULL,
-    `table_name`            varchar(64) CHARACTER SET utf8mb3 COLLATE utf8mb3_bin         NOT NULL,
-    `column_name`           varchar(64) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci  NOT NULL,
-    `ordinal_position`      bigint unsigned                                               NOT NULL,
-    `character_set_name`    varchar(32) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci  DEFAULT NULL,
-    `collation_name`        varchar(32) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci  DEFAULT NULL,
-    `data_type`             varchar(64) CHARACTER SET utf8mb3 COLLATE utf8mb3_bin         NOT NULL,
-    `column_key`            varchar(3)  CHARACTER SET utf8mb3 COLLATE utf8mb3_bin         NOT NULL,
+    `table_schema`       varchar(64)     NOT NULL,
+    `table_name`         varchar(64)     NOT NULL,
+    `column_name`        varchar(64)     NOT NULL,
+    `ordinal_position`   bigint unsigned NOT NULL,
+    `character_set_name` varchar(32) DEFAULT NULL,
+    `collation_name`     varchar(32) DEFAULT NULL,
+    `data_type`          varchar(64)     NOT NULL,
+    `column_key`         varchar(3)      NOT NULL,
     PRIMARY KEY (`table_schema`, `table_name`, `ordinal_position`)
-) ENGINE = InnoDB, CHARACTER SET = utf8mb3
+) ENGINE = InnoDB