database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-30 11:03:19 +03:00
Code Activity

Backpatch: Fix tsvector_out() and tsquery_out() to escape backslesh, add test of that.

Browse Source 
Patch by Bruce Momjian <bruce@momjian.us>
This commit is contained in:
Teodor Sigaev
2007-11-16 17:31:16 +00:00
parent 8145f00f27
commit 505292eb41
4 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
contrib/tsearch2/expected/tsearch2.out
View File

@ -342,6 +342,18 @@ SELECT '''the wether'':dc & '' sKies '':BC & a:d b:a';
'the wether':dc & ' sKies ':BC & a:d b:a
(1 row)
SELECT tsvector_in(tsvector_out('\'\\\\as\' ab\\c ab\\\\c AB\\\\\c ab\\\\\\\\c'::tsvector)), tsquery_in(tsquery_out('\'\\\\as\''::tsquery));
tsvector_in | tsquery_in
----------------------------------------+------------
'\\as' 'abc' 'AB\\c' 'ab\\c' 'ab\\\\c' | '\\as'
(1 row)
SELECT '\'\\\\as\' ab\\c ab\\\\c AB\\\\\c ab\\\\\\\\c'::tsvector, '\'\\\\as\''::tsquery;
tsvector | tsquery
----------------------------------------+---------
'\\as' 'abc' 'AB\\c' 'ab\\c' 'ab\\\\c' | '\\as'
(1 row)
select lexize('simple', 'ASD56 hsdkf');
lexize
-----------------

2
contrib/tsearch2/query.c
View File

@ -680,7 +680,7 @@ infix(INFIX * in, bool first)
in->cur++;
while (*op)
{
if (*op == '\'')
if (*op == '\'' || *op == '\\')
{
*(in->cur) = '\\';
in->cur++;

3
contrib/tsearch2/sql/tsearch2.sql
View File

@ -65,6 +65,9 @@ SELECT '1&(2&(4&(5|!6)))'::tsquery;
SELECT '1&(''2''&('' 4''&(\\|5 | ''6 \\'' !|&'')))'::tsquery;
SELECT '''the wether'':dc & '' sKies '':BC & a:d b:a';
SELECT tsvector_in(tsvector_out('\'\\\\as\' ab\\c ab\\\\c AB\\\\\c ab\\\\\\\\c'::tsvector)), tsquery_in(tsquery_out('\'\\\\as\''::tsquery));
SELECT '\'\\\\as\' ab\\c ab\\\\c AB\\\\\c ab\\\\\\\\c'::tsvector, '\'\\\\as\''::tsquery;
select lexize('simple', 'ASD56 hsdkf');
select lexize('en_stem', 'SKIES Problems identity');

2
contrib/tsearch2/tsvector.c
View File

@ -519,7 +519,7 @@ tsvector_out(PG_FUNCTION_ARGS)
j = ptr->len;
while (j--)
{
if (*curin == '\'')
if (*curin == '\'' || *curin == '\\')
{
int4 pos = curout - outbuf;