generate modify column

sunary · Jul 19, 2021 · fd31d2f · fd31d2f
1 parent b504fe6
commit fd31d2f
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 34 deletions.
diff --git a/element/column.go b/element/column.go
@@ -54,29 +54,7 @@ func (c Column) migrationUp(tbName, after string, ident int) []string {
 			strSql += strings.Repeat(" ", ident-len(c.Name))
 		}
 
-		if !sql.IsPostgres && c.Typ != nil {
-			strSql += " " + c.Typ.String()
-		} else if sql.IsPostgres && c.PgTyp != nil {
-			strSql += " " + sql.FamilyName(int32(c.PgTyp.Family))
-		}
-
-		for _, opt := range c.Options {
-			b := bytes.NewBufferString("")
-			var ctx *format.RestoreCtx
-			if sql.IsLower {
-				ctx = format.NewRestoreCtx(LowerRestoreFlag, b)
-			} else {
-				ctx = format.NewRestoreCtx(UppercaseRestoreFlag, b)
-			}
-
-			if sql.IsPostgres && opt.Tp == ast.ColumnOptionDefaultValue {
-				strSql += " " + b.String()
-				continue
-			}
-
-			_ = opt.Restore(ctx)
-			strSql += " " + b.String()
-		}
+		strSql += c.definition()
 
 		if ident < 0 {
 			if after != "" {
@@ -92,7 +70,7 @@ func (c Column) migrationUp(tbName, after string, ident int) []string {
 		return []string{fmt.Sprintf(sql.AlterTableDropColumnStm(), utils.EscapeSqlName(sql.IsPostgres, tbName), utils.EscapeSqlName(sql.IsPostgres, c.Name))}
 
 	case MigrateModifyAction:
-		return nil
+		return []string{fmt.Sprintf(sql.AlterTableModifyColumnStm(), utils.EscapeSqlName(sql.IsPostgres, tbName), utils.EscapeSqlName(sql.IsPostgres, c.Name)+c.definition())}
 
 	case MigrateRenameAction:
 		return []string{fmt.Sprintf(sql.AlterTableRenameColumnStm(), utils.EscapeSqlName(sql.IsPostgres, tbName), utils.EscapeSqlName(sql.IsPostgres, c.OldName), utils.EscapeSqlName(sql.IsPostgres, c.Name))}
@@ -114,6 +92,7 @@ func (c Column) migrationDown(tbName, after string) []string {
 		c.Action = MigrateAddAction
 
 	case MigrateModifyAction:
+		return nil
 
 	case MigrateRenameAction:
 		c.Name, c.OldName = c.OldName, c.Name
@@ -124,3 +103,32 @@ func (c Column) migrationDown(tbName, after string) []string {
 
 	return c.migrationUp(tbName, after, -1)
 }
+
+func (c Column) definition() string {
+	strSql := ""
+	if !sql.IsPostgres && c.Typ != nil {
+		strSql += " " + c.Typ.String()
+	} else if sql.IsPostgres && c.PgTyp != nil {
+		strSql += " " + sql.FamilyName(int32(c.PgTyp.Family))
+	}
+
+	for _, opt := range c.Options {
+		b := bytes.NewBufferString("")
+		var ctx *format.RestoreCtx
+		if sql.IsLower {
+			ctx = format.NewRestoreCtx(LowerRestoreFlag, b)
+		} else {
+			ctx = format.NewRestoreCtx(UppercaseRestoreFlag, b)
+		}
+
+		if sql.IsPostgres && opt.Tp == ast.ColumnOptionDefaultValue {
+			strSql += " " + b.String()
+			continue
+		}
+
+		_ = opt.Restore(ctx)
+		strSql += " " + b.String()
+	}
+
+	return strSql
+}
diff --git a/element/table.go b/element/table.go
@@ -46,11 +46,12 @@ func (t *Table) AddColumn(col Column) {
 	default:
 		t.Columns[id].Options = append(t.Columns[id].Options, col.Options...)
 
-		size := len(t.Columns[id].Options)
-		for i := range t.Columns[id].Options[:size-1] {
-			if t.Columns[id].Options[i].Tp == ast.ColumnOptionPrimaryKey {
-				t.Columns[id].Options[i], t.Columns[id].Options[size-1] = t.Columns[id].Options[size-1], t.Columns[id].Options[i]
-				break
+		if size := len(t.Columns[id].Options); size > 0 {
+			for i := range t.Columns[id].Options[:size-1] {
+				if t.Columns[id].Options[i].Tp == ast.ColumnOptionPrimaryKey {
+					t.Columns[id].Options[i], t.Columns[id].Options[size-1] = t.Columns[id].Options[size-1], t.Columns[id].Options[i]
+					break
+				}
 			}
 		}
 
@@ -194,7 +195,8 @@ func (t Table) getIndexIndex(idxName string) int {
 func (t *Table) Diff(old Table) {
 	for i := range t.Columns {
 		if j := old.getIndexColumn(t.Columns[i].Name); t.Columns[i].Action == MigrateAddAction && j >= 0 {
-			if t.Columns[i].Typ == old.Columns[j].Typ {
+			if (t.Columns[i].Typ != nil && t.Columns[i].Typ.String() == old.Columns[j].Typ.String()) ||
+				(t.Columns[i].PgTyp != nil && t.Columns[i].PgTyp == old.Columns[j].PgTyp) {
 				t.Columns[i].Action = MigrateNoAction
 			} else {
 				t.Columns[i] = old.Columns[j]

diff --git a/sql-parser/mysql.go b/sql-parser/mysql.go
@@ -51,11 +51,13 @@ func (p *Parser) Enter(in ast.Node) (ast.Node, bool) {
 
 			case ast.AlterTableModifyColumn:
 				if len(alter.Specs[i].NewColumns) > 0 {
-					col := element.Column{
-						Node: element.Node{Name: alter.Specs[i].OldColumnName.Name.O, Action: element.MigrateModifyAction},
-						Typ:  alter.Specs[i].NewColumns[0].Tp,
+					for j := range alter.Specs[i].NewColumns {
+						col := element.Column{
+							Node: element.Node{Name: alter.Specs[i].NewColumns[j].Name.Name.O, Action: element.MigrateModifyAction},
+							Typ:  alter.Specs[i].NewColumns[j].Tp,
+						}
+						p.Migration.AddColumn(alter.Table.Name.O, col)
 					}
-					p.Migration.AddColumn(alter.Table.Name.O, col)
 				}
 
 			case ast.AlterTableRenameColumn: