cherry pick of 14416 (#3560)

vitessio · Nov 1, 2023 · 9ced56d · 9ced56d
1 parent 98e05b4
commit 9ced56d
Show file tree

Hide file tree

Showing 16 changed files with 182 additions and 182 deletions.
diff --git a/go/vt/schema/online_ddl_test.go b/go/vt/schema/online_ddl_test.go
@@ -264,11 +264,11 @@ func TestNewOnlineDDLs(t *testing.T) {
  "drop table if exists t": {sqls: []string{"drop table if exists t"}},
  "drop table t1, t2, t3": {sqls: []string{"drop table t1", "drop table t2", "drop table t3"}},
  "drop table if exists t1, t2, t3": {sqls: []string{"drop table if exists t1", "drop table if exists t2", "drop table if exists t3"}},
- "create index i_idx on t(id)": {sqls: []string{"alter table t add index i_idx (id)"}},
- "create index i_idx on t(name(12))": {sqls: []string{"alter table t add index i_idx (`name`(12))"}},
- "create index i_idx on t(id, `ts`, name(12))": {sqls: []string{"alter table t add index i_idx (id, ts, `name`(12))"}},
- "create unique index i_idx on t(id)": {sqls: []string{"alter table t add unique index i_idx (id)"}},
- "create index i_idx using btree on t(id)": {sqls: []string{"alter table t add index i_idx (id) using btree"}},
+ "create index i_idx on t(id)": {sqls: []string{"alter table t add key i_idx (id)"}},
+ "create index i_idx on t(name(12))": {sqls: []string{"alter table t add key i_idx (`name`(12))"}},
+ "create index i_idx on t(id, `ts`, name(12))": {sqls: []string{"alter table t add key i_idx (id, ts, `name`(12))"}},
+ "create unique index i_idx on t(id)": {sqls: []string{"alter table t add unique key i_idx (id)"}},
+ "create index i_idx using btree on t(id)": {sqls: []string{"alter table t add key i_idx (id) using btree"}},
  "create view v as select * from t": {sqls: []string{"create view v as select * from t"}, isView: true},
  "alter view v as select * from t": {sqls: []string{"alter view v as select * from t"}, isView: true},
  "drop view v": {sqls: []string{"drop view v"}, isView: true},

diff --git a/go/vt/schemadiff/diff_test.go b/go/vt/schemadiff/diff_test.go
@@ -479,10 +479,10 @@ func TestDiffSchemas(t *testing.T) {
  from: "create table t1 (id mediumint unsigned NOT NULL, deleted_at timestamp, primary key (id), unique key deleted_check (id, (if((deleted_at is null),0,NULL))))",
  to: "create table t1 (id mediumint unsigned NOT NULL, deleted_at timestamp, primary key (id), unique key deleted_check (id, (if((deleted_at is not null),0,NULL))))",
  diffs: []string{
- "alter table t1 drop key deleted_check, add unique index deleted_check (id, (if(deleted_at is not null, 0, null)))",
+ "alter table t1 drop key deleted_check, add unique key deleted_check (id, (if(deleted_at is not null, 0, null)))",
  },
  cdiffs: []string{
- "ALTER TABLE `t1` DROP KEY `deleted_check`, ADD UNIQUE INDEX `deleted_check` (`id`, (if(`deleted_at` IS NOT NULL, 0, NULL)))",
+ "ALTER TABLE `t1` DROP KEY `deleted_check`, ADD UNIQUE KEY `deleted_check` (`id`, (if(`deleted_at` IS NOT NULL, 0, NULL)))",
  },
  },
  {
@@ -658,13 +658,13 @@ func TestDiffSchemas(t *testing.T) {
  to: "create table t7(id int primary key); create table t5 (id int primary key, i int, constraint f5 foreign key (i) references t7(id)); create table t4 (id int primary key, i int, constraint f4 foreign key (i) references t7(id));",
  diffs: []string{
  "create table t7 (\n\tid int,\n\tprimary key (id)\n)",
- "create table t4 (\n\tid int,\n\ti int,\n\tprimary key (id),\n\tindex f4 (i),\n\tconstraint f4 foreign key (i) references t7 (id)\n)",
- "create table t5 (\n\tid int,\n\ti int,\n\tprimary key (id),\n\tindex f5 (i),\n\tconstraint f5 foreign key (i) references t7 (id)\n)",
+ "create table t4 (\n\tid int,\n\ti int,\n\tprimary key (id),\n\tkey f4 (i),\n\tconstraint f4 foreign key (i) references t7 (id)\n)",
+ "create table t5 (\n\tid int,\n\ti int,\n\tprimary key (id),\n\tkey f5 (i),\n\tconstraint f5 foreign key (i) references t7 (id)\n)",
  },
  cdiffs: []string{
  "CREATE TABLE `t7` (\n\t`id` int,\n\tPRIMARY KEY (`id`)\n)",
- "CREATE TABLE `t4` (\n\t`id` int,\n\t`i` int,\n\tPRIMARY KEY (`id`),\n\tINDEX `f4` (`i`),\n\tCONSTRAINT `f4` FOREIGN KEY (`i`) REFERENCES `t7` (`id`)\n)",
- "CREATE TABLE `t5` (\n\t`id` int,\n\t`i` int,\n\tPRIMARY KEY (`id`),\n\tINDEX `f5` (`i`),\n\tCONSTRAINT `f5` FOREIGN KEY (`i`) REFERENCES `t7` (`id`)\n)",
+ "CREATE TABLE `t4` (\n\t`id` int,\n\t`i` int,\n\tPRIMARY KEY (`id`),\n\tKEY `f4` (`i`),\n\tCONSTRAINT `f4` FOREIGN KEY (`i`) REFERENCES `t7` (`id`)\n)",
+ "CREATE TABLE `t5` (\n\t`id` int,\n\t`i` int,\n\tPRIMARY KEY (`id`),\n\tKEY `f5` (`i`),\n\tCONSTRAINT `f5` FOREIGN KEY (`i`) REFERENCES `t7` (`id`)\n)",
  },
  },
  {