From 02024e9302a9ad1e3ba8b9f4495f440722adc1a9 Mon Sep 17 00:00:00 2001 From: Frédéric Buclin Date: Wed, 28 Dec 2011 12:07:54 +0100 Subject: Bug 713144: The SQL query to remove older searches from the profile_search table should be more robust r=dkl a=LpSolit --- Bugzilla/Search/Recent.pm | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'Bugzilla') diff --git a/Bugzilla/Search/Recent.pm b/Bugzilla/Search/Recent.pm index 89d9cf6ff..ccd4a0f09 100644 --- a/Bugzilla/Search/Recent.pm +++ b/Bugzilla/Search/Recent.pm @@ -57,14 +57,16 @@ sub create { my $class = shift; my $dbh = Bugzilla->dbh; $dbh->bz_start_transaction(); - my $search = $class->SUPER::create(@_); + my $search = $class->SUPER::create(@_); + my $user_id = $search->user_id; # Enforce there only being SAVE_NUM_SEARCHES per user. - my ($num_searches, $min_id) = $dbh->selectrow_array( - 'SELECT COUNT(*), MIN(id) FROM profile_search WHERE user_id = ?', - undef, $search->user_id); - if ($num_searches > SAVE_NUM_SEARCHES) { - $dbh->do('DELETE FROM profile_search WHERE id = ?', undef, $min_id); + my $min_id = $dbh->selectrow_array( + 'SELECT id FROM profile_search WHERE user_id = ? ORDER BY id DESC ' + . $dbh->sql_limit(1, SAVE_NUM_SEARCHES), undef, $user_id); + if ($min_id) { + $dbh->do('DELETE FROM profile_search WHERE user_id = ? AND id <= ?', + undef, ($user_id, $min_id)); } $dbh->bz_commit_transaction(); return $search; -- cgit v1.2.3-24-g4f1b