Fix MySQL and PostgreSQL column drop SQL (#3649)

lafriks · appleboy · commit de8a091767ef · 2018-03-09T09:20:57.000+08:00
diff --git a/models/migrations/migrations.go b/models/migrations/migrations.go
@@ -233,7 +233,7 @@ func dropTableColumns(x *xorm.Engine, tableName string, columnNames ...string) (
 			}
 			cols += "DROP COLUMN `" + col + "`"
 		}
-		if _, err := x.Exec(fmt.Sprintf("ALTER TABLE `%s` %s", tableName, columnNames)); err != nil {
+		if _, err := x.Exec(fmt.Sprintf("ALTER TABLE `%s` %s", tableName, cols)); err != nil {
 			return fmt.Errorf("Drop table `%s` columns %v: %v", tableName, columnNames, err)
 		}
 	case setting.UseMSSQL:

Original file line number	Diff line number	Diff line change
`@@ -233,7 +233,7 @@ func dropTableColumns(x *xorm.Engine, tableName string, columnNames ...string) (`
`233`	`233`	`}`
`234`	`234`	cols += "DROP COLUMN `" + col + "`"
`235`	`235`	`}`
`236`		- if _, err := x.Exec(fmt.Sprintf("ALTER TABLE `%s` %s", tableName, columnNames)); err != nil {
	`236`	+ if _, err := x.Exec(fmt.Sprintf("ALTER TABLE `%s` %s", tableName, cols)); err != nil {
`237`	`237`	return fmt.Errorf("Drop table `%s` columns %v: %v", tableName, columnNames, err)
`238`	`238`	`}`
`239`	`239`	`case setting.UseMSSQL:`