diff options
author | Stan Hu <stanhu@gmail.com> | 2017-05-17 04:51:11 +0000 |
---|---|---|
committer | Timothy Andrew <mail@timothyandrew.net> | 2017-05-17 05:33:13 +0000 |
commit | 49ed9060f7d3826a21c429684a01357d028735b5 (patch) | |
tree | 56db18ddbe0e4ce9ef0de3a21d5cab736c1d850e | |
parent | 5e69a4b977549dd09c10e7b2e0f9647e15628516 (diff) | |
download | gitlab-ce-49ed9060f7d3826a21c429684a01357d028735b5.tar.gz |
Merge branch 'sh-fix-delete-assignees-mysql' into 'master'
Fix deletion of issue assignees for MySQL
See merge request !11426
-rw-r--r-- | app/services/members/authorized_destroy_service.rb | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/app/services/members/authorized_destroy_service.rb b/app/services/members/authorized_destroy_service.rb index cd16ab7e52f..1195cd2bdb9 100644 --- a/app/services/members/authorized_destroy_service.rb +++ b/app/services/members/authorized_destroy_service.rb @@ -37,10 +37,15 @@ module Members else project = member.source - IssueAssignee.delete_all( - user_id: member.user_id, - issue_id: project.issues.opened.assigned_to(member.user).select(:id) - ) + # SELECT 1 FROM issues WHERE issues.id = issue_assignees.issue_id AND issues.project_id = X + issues = Issue.unscoped.select(1). + where('issues.id = issue_assignees.issue_id'). + where(project_id: project.id) + + # DELETE FROM issue_assignees WHERE user_id = X AND EXISTS (...) + IssueAssignee.unscoped. + where('user_id = :user_id AND EXISTS (:sub)', user_id: member.user_id, sub: issues). + delete_all project.merge_requests.opened.assigned_to(member.user).update_all(assignee_id: nil) member.user.update_cache_counts |