Fix column droping for MSSQL that need new transaction for that (go-g…

…itea#4440)
lafriks-fork · Jul 20, 2018 · 57ea79d · 57ea79d
1 parent 88d7910
commit 57ea79d
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 0 deletions.
diff --git a/models/migrations/v64.go b/models/migrations/v64.go
@@ -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 {
 		return err
 	}

diff --git a/models/migrations/v69.go b/models/migrations/v69.go
@@ -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 {
 		return err
 	}