Nemcio/Gogs
1
0
Fork 0
mirror of https://github.com/gogs/gogs.git synced 2026-05-07 22:06:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

Complete XORM to GORM migration for internal/database/pull.go

Browse Source 
Co-authored-by: unknwon <2946214+unknwon@users.noreply.github.com>
This commit is contained in:
copilot-swe-agent[bot]
2026-01-24 15:47:50 +00:00
parent 04d063c65d
commit 748ecbfdf3
1 changed files with 167 additions and 168 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
internal/database/pull.go
View File

@@ -315,14 +315,10 @@ func (pr *PullRequest) Merge(doer *User, baseGitRepo *git.Repository, mergeStyle
pr.HasMerged = true pr.HasMerged = true
pr.Merged = time.Now() pr.Merged = time.Now()
pr.MergerID = doer.ID pr.MergerID = doer.ID
if _, err = sess.ID(pr.ID).AllCols().Update(pr); err != nil { if err := tx.Model(&PullRequest{}).Where("id = ?", pr.ID).Updates(pr).Error; err != nil {
return errors.Newf("update pull request: %v", err) return errors.Newf("update pull request: %v", err)
} }
if err = sess.Commit(); err != nil {
return errors.Newf("commit: %v", err)
}
if err = Handle.Actions().MergePullRequest(ctx, doer, pr.Issue.Repo.Owner, pr.Issue.Repo, pr.Issue); err != nil { if err = Handle.Actions().MergePullRequest(ctx, doer, pr.Issue.Repo.Owner, pr.Issue.Repo, pr.Issue); err != nil {
log.Error("Failed to create action for merge pull request, pull_request_id: %d, error: %v", pr.ID, err) log.Error("Failed to create action for merge pull request, pull_request_id: %d, error: %v", pr.ID, err)
} }
@@ -382,6 +378,7 @@ func (pr *PullRequest) Merge(doer *User, baseGitRepo *git.Repository, mergeStyle
return nil return nil
} }
return nil return nil
})
} }
// testPatch checks if patch can be merged to base repository without conflict. // testPatch checks if patch can be merged to base repository without conflict.
@@ -460,12 +457,14 @@ func NewPullRequest(repo *Repository, pull *Issue, labelIDs []int64, uuids []str
} }
pr.IssueID = pull.ID pr.IssueID = pull.ID
if _, err = sess.Insert(pr); err != nil { if err := tx.Create(pr).Error; err != nil {
return errors.Newf("insert pull repo: %v", err) return errors.Newf("insert pull repo: %v", err)
} }
if err = sess.Commit(); err != nil { return nil
return errors.Newf("commit: %v", err) })
if err != nil {
return err
} }
if err = NotifyWatchers(&Action{ if err = NotifyWatchers(&Action{
@@ -745,7 +744,7 @@ func (prs PullRequestList) loadAttributes(db *gorm.DB) (err error) {
// Load attributes // Load attributes
for i := range prs { for i := range prs {
if err = prs[i].loadAttributes(e); err != nil { if err = prs[i].loadAttributes(db); err != nil {
return errors.Newf("loadAttributes [%d]: %v", prs[i].ID, err) return errors.Newf("loadAttributes [%d]: %v", prs[i].ID, err)
} }
} }
@@ -754,7 +753,7 @@ func (prs PullRequestList) loadAttributes(db *gorm.DB) (err error) {
} }
func (prs PullRequestList) LoadAttributes() error { func (prs PullRequestList) LoadAttributes() error {
return prs.loadAttributes(x) return prs.loadAttributes(db)
} }
func addHeadRepoTasks(prs []*PullRequest) { func addHeadRepoTasks(prs []*PullRequest) {