From 09d4f0e3cd6dbf897d9175b098e2398c1561c0ac Mon Sep 17 00:00:00 2001
From: "lpsolit%gmail.com" <>
Date: Wed, 29 Oct 2008 05:25:43 +0000
Subject: Bug 461729: [PostgreSQL] Incorrect SQL is generated when searching
 for keywords with dashes in them - Patch by Frédéric Buclin
 <LpSolit@gmail.com> r/a=mkanat
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Bugzilla/Search.pm | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'Bugzilla')

diff --git a/Bugzilla/Search.pm b/Bugzilla/Search.pm
index 4b21b216b..557af6646 100644
--- a/Bugzilla/Search.pm
+++ b/Bugzilla/Search.pm
@@ -879,12 +879,9 @@ sub GetByWordList {
         my $word = $w;
         if ($word ne "") {
             $word =~ tr/A-Z/a-z/;
-            $word = $dbh->quote(quotemeta($word));
+            $word = $dbh->quote('(^|[^a-z0-9])' . quotemeta($word) . '($|[^a-z0-9])');
             trick_taint($word);
-            $word =~ s/^'//;
-            $word =~ s/'$//;
-            $word = '(^|[^a-z0-9])' . $word . '($|[^a-z0-9])';
-            push(@list, $dbh->sql_regexp($field, "'$word'"));
+            push(@list, $dbh->sql_regexp($field, $word));
         }
     }
 
-- 
cgit v1.2.3-24-g4f1b