Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1027182: merge-users.pl - SQL to remove bug_user_last_visit not correct

Browse Source 
r=glob,a=sgreen


git-svn-id: svn://10.0.0.236/trunk@265452 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
bzrmirror%bugzilla.org
2014-07-10 02:00:46 +00:00
parent c3f889a71f
commit 2caad1018b
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mozilla/webtools/bugzilla/.bzrrev
View File

@@ -1 +1 @@
9075
9076

2
mozilla/webtools/bugzilla/.gitrev
View File

@@ -1 +1 @@
70b1cb4b8ff30538b3f952a5418ff5b12dc38662
2f10cf7b02a921d4e85bd3514035bccef06f3fc7

5
mozilla/webtools/bugzilla/contrib/merge-users.pl
View File

@@ -154,8 +154,9 @@ my $dupe_ids = $dbh->selectcol_arrayref("
INNER JOIN bug_user_last_visit as later
ON (earlier.user_id != later.user_id AND earlier.last_visit_ts < later.last_visit_ts
AND earlier.bug_id = later.bug_id)
WHERE (earlier.user_id = ? OR earlier.user_id = ?)",
undef, $old_id, $new_id);
WHERE (earlier.user_id = ? OR earlier.user_id = ?)
AND (later.user_id = ? OR later.user_id = ?)",
undef, $old_id, $new_id, $old_id, $new_id);
$dbh->do("DELETE FROM bug_user_last_visit WHERE " . $dbh->sql_in('id', $dupe_ids));
# Migrate records from old user to new user.