add ManuallyMergeConfirmedVersion to sync ManuallyMergeConfirmed

Signed-off-by: a1012112796 <1012112796@qq.com>

Author: a1012112796

models/issues/pull.go

@@ -178,7 +178,8 @@ type PullRequest struct {
 
 	Flow PullRequestFlow `xorm:"NOT NULL DEFAULT 0"`
 
-	ManuallyMergePullConfirmed bool `xorm:"NOT NULL DEFAULT false"`
+	ManuallyMergeConfirmed        bool  `xorm:"NOT NULL DEFAULT false"`
+	ManuallyMergeConfirmedVersion int64 `xorm:"NOT NULL DEFAULT 0"`
 }
 
 func init() {
@@ -836,9 +837,21 @@ func ManuallyMergePullConfirmByIndexes(ctx context.Context, repoID int64, baseBr
 		builder.Eq{"has_merged": false},
 		builder.In("`index`", indexes),
 		builder.In("`base_branch`", baseBranchs),
-	)).Cols("manually_merge_pull_confirmed").Update(&PullRequest{
-		ManuallyMergePullConfirmed: true,
-	})
+	)).
+		Incr("manually_merge_confirmed_version").
+		SetExpr("manually_merge_confirmed", true).Update(new(PullRequest))
+
+	return err
+}
 
+// ResetManuallyMergePullConfirm reset manualy merge confirmed flag
+func (pr *PullRequest) ResetManuallyMergePullConfirm(ctx context.Context) error {
+	_, err := db.GetEngine(ctx).
+		Where(builder.And(
+			builder.Eq{"`id`": pr.ID},
+			builder.Eq{"manually_merge_confirmed_version": pr.ManuallyMergeConfirmedVersion},
+		)).
+		Incr("manually_merge_confirmed_version").
+		SetExpr("manually_merge_confirmed", false).Update(new(PullRequest))
 	return err
 }

models/migrations/v1_19/v237.go

@@ -11,7 +11,8 @@ func AddManuallyMergePullConfirmedToPullRequest(x *xorm.Engine) error {
 	type PullRequest struct {
 		ID int64 `xorm:"pk autoincr"`
 
-		ManuallyMergePullConfirmed bool `xorm:"NOT NULL DEFAULT false"`
+		ManuallyMergeConfirmed        bool  `xorm:"NOT NULL DEFAULT false"`
+		ManuallyMergeConfirmedVersion int64 `xorm:"NOT NULL DEFAULT 0"`
 	}
 
 	return x.Sync(new(PullRequest))

services/pull/check.go

@@ -236,7 +236,7 @@ func manuallyMerged(ctx context.Context, pr *issues_model.PullRequest) bool {
 		return false
 	}
 
-	if !pr.ManuallyMergePullConfirmed {
+	if !pr.ManuallyMergeConfirmed {
 		if unit, err := pr.BaseRepo.GetUnit(ctx, unit.TypePullRequests); err == nil {
 			config := unit.PullRequestsConfig()
 			if !config.AutodetectManualMerge {
@@ -285,9 +285,9 @@ func manuallyMerged(ctx context.Context, pr *issues_model.PullRequest) bool {
 		return true
 	}
 
-	if pr.ManuallyMergePullConfirmed {
-		pr.ManuallyMergePullConfirmed = false
-		if err := pr.UpdateCols("manually_merge_pull_confirmed"); err != nil {
+	if pr.ManuallyMergeConfirmed {
+		pr.ManuallyMergeConfirmed = false
+		if err := pr.ResetManuallyMergePullConfirm(ctx); err != nil {
 			log.Error("PullRequest[%d]: reset manually_merge_pull_confirmed failed: %v", pr.ID, err)
 		}
 	}