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

r/a=glob

Author: dylanwh

contrib/merge-users.pl

@@ -171,12 +171,17 @@ =head1 SYNOPSIS
     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) {