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

Bug 1056087 - contrib/merge-users.pl fails if there are no duplicate bug_user_last_visit rows

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@265520 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
bzrmirror%bugzilla.org
2014-08-26 14:30:48 +00:00
parent 2583cbf64b
commit 8043b2aa0e
3 changed files with 9 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 @@
9115
9116

2
mozilla/webtools/bugzilla/.gitrev
View File

@@ -1 +1 @@
0922b44649075532dea64bdc6469446a34f5219f
82346032ecfef148e78a8d19e17c5ed41ed41d10

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

@@ -154,12 +154,17 @@ my $dupe_ids = $dbh->selectcol_arrayref("
SELECT earlier.id
FROM bug_user_last_visit as earlier
INNER JOIN bug_user_last_visit as later
ON (earlier.user_id != later.user_id AND earlier.last_visit_ts < later.last_visit_ts
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 = ?)
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));
if (@$dupe_ids) {
$dbh->do("DELETE FROM bug_user_last_visit WHERE " .
$dbh->sql_in('id', $dupe_ids));
}
# Migrate records from old user to new user.
foreach my $table (keys %changes) {