Fix column droping for MSSQL that need new transaction for that (#4440)

release/v1.15
Lauris BH 2018-07-13 18:20:40 +03:00 committed by techknowlogick
parent 659bc727bd
commit e95417ea2c
2 changed files with 16 additions and 0 deletions

View File

@ -120,6 +120,14 @@ func addMultipleAssignees(x *xorm.Engine) error {
} }
} }
// Commit and begin new transaction for dropping columns
if err := sess.Commit(); err != nil {
return err
}
if err := sess.Begin(); err != nil {
return err
}
if err := dropTableColumns(sess, "issue", "assignee_id"); err != nil { if err := dropTableColumns(sess, "issue", "assignee_id"); err != nil {
return err return err
} }

View File

@ -73,6 +73,14 @@ func moveTeamUnitsToTeamUnitTable(x *xorm.Engine) error {
} }
} }
// Commit and begin new transaction for dropping columns
if err := sess.Commit(); err != nil {
return err
}
if err := sess.Begin(); err != nil {
return err
}
if err := dropTableColumns(sess, "team", "unit_types"); err != nil { if err := dropTableColumns(sess, "team", "unit_types"); err != nil {
return err return err
} }