From 1cc6bd07a3aa7a0e228d66d850958266464bd40d Mon Sep 17 00:00:00 2001 From: abeizn Date: Fri, 19 Aug 2022 16:56:17 +0800 Subject: [PATCH 1/2] fix: issue_number does not exist --- plugins/refdiff/tasks/ref_issue_diff_calculator.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/refdiff/tasks/ref_issue_diff_calculator.go b/plugins/refdiff/tasks/ref_issue_diff_calculator.go index ea2b479a728..347f34ba8e0 100644 --- a/plugins/refdiff/tasks/ref_issue_diff_calculator.go +++ b/plugins/refdiff/tasks/ref_issue_diff_calculator.go @@ -64,10 +64,10 @@ func CalculateIssuesDiff(taskCtx core.SubTaskContext) error { dal.Join("left join pull_request_issues on pull_request_issues.pull_request_id = _combine_pr.id"), dal.Join("left join refs on refs.commit_sha = refs_commits_diffs.new_ref_commit_sha"), dal.Orderby("refs_commits_diffs.new_ref_id ASC"), - dal.Where("refs.repo_id = ? and pull_request_issues.issue_number > 0 and (refs_commits_diffs.new_ref_id, refs_commits_diffs.old_ref_id) in ?", + dal.Where("refs.repo_id = ? and pull_request_issues.issue_key > 0 and (refs_commits_diffs.new_ref_id, refs_commits_diffs.old_ref_id) in ?", repoId, pairList), dal.Select(`refs_commits_diffs.new_ref_commit_sha as new_ref_commit_sha, refs_commits_diffs.old_ref_commit_sha as old_ref_commit_sha, - pull_request_issues.issue_id as issue_id, pull_request_issues.issue_number as issue_number, + pull_request_issues.issue_id as issue_id, pull_request_issues.issue_key as issue_key, refs_commits_diffs.new_ref_id as new_ref_id, refs_commits_diffs.old_ref_id as old_ref_id`), ) if err != nil { From f340f9b5b08b94342fd43ab1b7d282038532d31e Mon Sep 17 00:00:00 2001 From: abeizn Date: Mon, 22 Aug 2022 11:29:58 +0800 Subject: [PATCH 2/2] fix: issue_number does not exist --- plugins/refdiff/tasks/ref_issue_diff_calculator.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/refdiff/tasks/ref_issue_diff_calculator.go b/plugins/refdiff/tasks/ref_issue_diff_calculator.go index 347f34ba8e0..9656cbf737e 100644 --- a/plugins/refdiff/tasks/ref_issue_diff_calculator.go +++ b/plugins/refdiff/tasks/ref_issue_diff_calculator.go @@ -67,7 +67,7 @@ func CalculateIssuesDiff(taskCtx core.SubTaskContext) error { dal.Where("refs.repo_id = ? and pull_request_issues.issue_key > 0 and (refs_commits_diffs.new_ref_id, refs_commits_diffs.old_ref_id) in ?", repoId, pairList), dal.Select(`refs_commits_diffs.new_ref_commit_sha as new_ref_commit_sha, refs_commits_diffs.old_ref_commit_sha as old_ref_commit_sha, - pull_request_issues.issue_id as issue_id, pull_request_issues.issue_key as issue_key, + pull_request_issues.issue_id as issue_id, pull_request_issues.issue_key as issue_number, refs_commits_diffs.new_ref_id as new_ref_id, refs_commits_diffs.old_ref_id as old_ref_id`), ) if err != nil {