Migrations (v82,v96,v99,v136) remove dependencies (#12286)

* remove dependencys

* add missing fields

* CI.restart()
This commit is contained in:
6543 2020-07-22 16:27:22 +02:00 committed by GitHub
parent 8e20daaede
commit 2753d72773
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 35 additions and 11 deletions

View file

@ -11,7 +11,6 @@ import (
"strings"
"time"
"code.gitea.io/gitea/models"
"code.gitea.io/gitea/modules/git"
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/setting"
@ -29,7 +28,9 @@ func addCommitDivergenceToPulls(x *xorm.Engine) error {
}
type PullRequest struct {
ID int64 `xorm:"pk autoincr"`
ID int64 `xorm:"pk autoincr"`
IssueID int64 `xorm:"INDEX"`
Index int64
CommitsAhead int
CommitsBehind int
@ -41,7 +42,7 @@ func addCommitDivergenceToPulls(x *xorm.Engine) error {
MergedCommitID string `xorm:"VARCHAR(40)"`
}
if err := x.Sync2(new(models.PullRequest)); err != nil {
if err := x.Sync2(new(PullRequest)); err != nil {
return fmt.Errorf("Sync2: %v", err)
}
@ -64,7 +65,7 @@ func addCommitDivergenceToPulls(x *xorm.Engine) error {
if err := sess.Begin(); err != nil {
return err
}
var results = make([]*models.PullRequest, 0, batchSize)
var results = make([]*PullRequest, 0, batchSize)
err := sess.Where("has_merged = ?", false).OrderBy("id").Limit(batchSize, last).Find(&results)
if err != nil {
return err