sql/mysql: detect CHANGE COLUMN changes (#2719)

ariga · Apr 25, 2024 · 7d858b5 · 7d858b5
1 parent 13b0850
commit 7d858b5
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 11 deletions.
diff --git a/sql/mysql/migrate.go b/sql/mysql/migrate.go
@@ -398,7 +398,12 @@ func (s *state) alterTable(t *schema.Table, changes []schema.Change) error {
 				if err := checkChangeGenerated(change.From, change.To); err != nil {
 					return err
 				}
-				b.P("MODIFY COLUMN")
+				// In case the column was both modified and renamed.
+				if change.To.Name != change.From.Name {
+					b.P("CHANGE COLUMN").Ident(change.From.Name)
+				} else {
+					b.P("MODIFY COLUMN")
+				}
 				if err := s.column(b, t, change.To); err != nil {
 					return err
 				}

diff --git a/sql/mysql/migrate_test.go b/sql/mysql/migrate_test.go
@@ -959,22 +959,30 @@ func TestPlanChanges(t *testing.T) {
 			changes: []schema.Change{
 				&schema.ModifyTable{
 					T: schema.NewTable("users").
-						AddColumns(schema.NewIntColumn("c", "int").SetGeneratedExpr(&schema.GeneratedExpr{Expr: "1", Type: "STORED"})),
+						AddColumns(
+							schema.NewIntColumn("c", "int").SetGeneratedExpr(&schema.GeneratedExpr{Expr: "1", Type: "STORED"}),
+							schema.NewIntColumn("c1", "int").SetGeneratedExpr(&schema.GeneratedExpr{Expr: "1", Type: "STORED"}),
+						),
 					Changes: []schema.Change{
 						&schema.ModifyColumn{
 							Change: schema.ChangeGenerated,
 							From:   schema.NewIntColumn("c", "int"),
 							To:     schema.NewIntColumn("c", "int").SetGeneratedExpr(&schema.GeneratedExpr{Expr: "1", Type: "STORED"}),
 						},
+						&schema.ModifyColumn{
+							Change: schema.ChangeGenerated,
+							From:   schema.NewIntColumn("c0", "int"),
+							To:     schema.NewIntColumn("c1", "int").SetGeneratedExpr(&schema.GeneratedExpr{Expr: "1", Type: "STORED"}),
+						},
 					},
 				},
 			},
 			wantPlan: &migrate.Plan{
 				Reversible: true,
 				Changes: []*migrate.Change{
 					{
-						Cmd:     "ALTER TABLE `users` MODIFY COLUMN `c` int AS (1) STORED NOT NULL",
-						Reverse: "ALTER TABLE `users` MODIFY COLUMN `c` int NOT NULL",
+						Cmd:     "ALTER TABLE `users` MODIFY COLUMN `c` int AS (1) STORED NOT NULL, CHANGE COLUMN `c0` `c1` int AS (1) STORED NOT NULL",
+						Reverse: "ALTER TABLE `users` CHANGE COLUMN `c1` `c0` int NOT NULL, MODIFY COLUMN `c` int NOT NULL",
 					},
 				},
 			},

diff --git a/sql/sqlcheck/incompatible/incompatible.go b/sql/sqlcheck/incompatible/incompatible.go
@@ -60,13 +60,23 @@ func (a *Analyzer) Analyze(_ context.Context, p *sqlcheck.Pass) error {
 				}
 			case *schema.ModifyTable:
 				for j := range c.Changes {
-					r, ok := c.Changes[j].(*schema.RenameColumn)
-					if ok && p.File.TableSpan(c.T)&sqlcheck.SpanAdded == 0 && !wasAddedBack(p.File.Changes[i:], r.From) {
-						diags = append(diags, sqlcheck.Diagnostic{
-							Code: codeRenameC,
-							Pos:  sc.Stmt.Pos,
-							Text: fmt.Sprintf("Renaming column %q to %q", r.From.Name, r.To.Name),
-						})
+					switch mc := c.Changes[j].(type) {
+					case *schema.RenameColumn:
+						if p.File.TableSpan(c.T)&sqlcheck.SpanAdded == 0 && !wasAddedBack(p.File.Changes[i:], mc.From) {
+							diags = append(diags, sqlcheck.Diagnostic{
+								Code: codeRenameC,
+								Pos:  sc.Stmt.Pos,
+								Text: fmt.Sprintf("Renaming column %q to %q", mc.From.Name, mc.To.Name),
+							})
+						}
+					case *schema.ModifyColumn:
+						if p.File.TableSpan(c.T)&sqlcheck.SpanAdded == 0 && mc.From.Name != mc.To.Name && !wasAddedBack(p.File.Changes[i:], mc.From) {
+							diags = append(diags, sqlcheck.Diagnostic{
+								Code: codeRenameC,
+								Pos:  sc.Stmt.Pos,
+								Text: fmt.Sprintf("Renaming column %q to %q", mc.From.Name, mc.To.Name),
+							})
+						}
 					}
 				}
 			}