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

Bug 578494: We can't use "shellwords" to split words for sql_fulltext on Pg,

Browse Source 
because it doesn't work with unbalanced single quotes. So we just do a hack
to make Quicksearch work right, for Pg.
r=LpSolit, a=mkanat


git-svn-id: svn://10.0.0.236/trunk@260938 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
mkanat%bugzilla.org
2010-08-02 01:34:28 +00:00
parent 2c4d7974a0
commit 7765f561eb
2 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mozilla/webtools/bugzilla/.bzrrev
View File

@@ -1 +1 @@
7414
7415

23
mozilla/webtools/bugzilla/Bugzilla/DB.pm
View File

@@ -45,7 +45,6 @@ use Bugzilla::DB::Schema;
use List::Util qw(max);
use Storable qw(dclone);
use Text::ParseWords qw(shellwords);
#####################################################################
# Constants
@@ -395,16 +394,28 @@ sub sql_fulltext_search {
# make the string lowercase to do case insensitive search
my $lower_text = lc($text);
# split the text we're searching for into separate words, understanding
# quotes.
my @words = shellwords($lower_text);
# split the text we're searching for into separate words. As a hack
# to allow quicksearch to work, if the field starts and ends with
# a double-quote, then we don't split it into words. We can't use
# Text::ParseWords here because it gets very confused by unbalanced
# quotes, which breaks searches like "don't try this" (because of the
# unbalanced single-quote in "don't").
my @words;
if ($lower_text =~ /^"/ and $lower_text =~ /"$/) {
$lower_text =~ s/^"//;
$lower_text =~ s/"$//;
@words = ($lower_text);
}
else {
@words = split(/\s+/, $lower_text);
}
# surround the words with wildcards and SQL quotes so we can use them
# in LIKE search clauses
@words = map($self->quote("%$_%"), @words);
@words = map($self->quote("\%$_\%"), @words);
# untaint words, since they are safe to use now that we've quoted them
map(trick_taint($_), @words);
trick_taint($_) foreach @words;
# turn the words into a set of LIKE search clauses
@words = map("LOWER($column) LIKE $_", @words);