mirror of
https://github.com/postgres/postgres.git
synced 2026-03-14 06:32:18 -04:00
3e91dba8b0
This commit addresses a set of issues when changing token type mappings
in a text search configuration when using duplicated token names:
- ADD MAPPING would fail on insertion because of a constraint failure
after inserting the same mapping.
- ALTER MAPPING with an "overridden" configuration failed with "tuple
already updated by self" when the token mappings are removed.
- DROP MAPPING failed with "tuple already updated by self", like
previously, but in a different code path.
The code is refactored so the token names (with their numbers) are
handled as a List with unique members rather than an array with numbers,
ensuring that no duplicates mess up with the catalog inserts, updates
and deletes. The list is generated by getTokenTypes(), with the same
error handling as previously while duplicated tokens are discarded from
the list used to work on the catalogs.
Regression tests are expanded to cover much more ground for the cases
fixed by this commit, as there was no coverage for the code touched in
this commit. A bit more is done regarding the fact that a token name
not supported by a configuration's parser should result in an error even
if IF EXISTS is used in a DROP MAPPING clause. This is implied in the
code but there was no coverage for that, and it was very easy to miss.
These issues exist since at least their introduction in core with
140d4ebcb4, so backpatch all the way down.
Reported-by: Alexander Lakhin
Author: Tender Wang, Michael Paquier
Discussion: https://postgr.es/m/18310-1eb233c5908189c8@postgresql.org
Backpatch-through: 12
283 lines
10 KiB
SQL
283 lines
10 KiB
SQL
--Test text search dictionaries and configurations
|
|
|
|
-- Test ISpell dictionary with ispell affix file
|
|
CREATE TEXT SEARCH DICTIONARY ispell (
|
|
Template=ispell,
|
|
DictFile=ispell_sample,
|
|
AffFile=ispell_sample
|
|
);
|
|
|
|
SELECT ts_lexize('ispell', 'skies');
|
|
SELECT ts_lexize('ispell', 'bookings');
|
|
SELECT ts_lexize('ispell', 'booking');
|
|
SELECT ts_lexize('ispell', 'foot');
|
|
SELECT ts_lexize('ispell', 'foots');
|
|
SELECT ts_lexize('ispell', 'rebookings');
|
|
SELECT ts_lexize('ispell', 'rebooking');
|
|
SELECT ts_lexize('ispell', 'rebook');
|
|
SELECT ts_lexize('ispell', 'unbookings');
|
|
SELECT ts_lexize('ispell', 'unbooking');
|
|
SELECT ts_lexize('ispell', 'unbook');
|
|
|
|
SELECT ts_lexize('ispell', 'footklubber');
|
|
SELECT ts_lexize('ispell', 'footballklubber');
|
|
SELECT ts_lexize('ispell', 'ballyklubber');
|
|
SELECT ts_lexize('ispell', 'footballyklubber');
|
|
|
|
-- Test ISpell dictionary with hunspell affix file
|
|
CREATE TEXT SEARCH DICTIONARY hunspell (
|
|
Template=ispell,
|
|
DictFile=ispell_sample,
|
|
AffFile=hunspell_sample
|
|
);
|
|
|
|
SELECT ts_lexize('hunspell', 'skies');
|
|
SELECT ts_lexize('hunspell', 'bookings');
|
|
SELECT ts_lexize('hunspell', 'booking');
|
|
SELECT ts_lexize('hunspell', 'foot');
|
|
SELECT ts_lexize('hunspell', 'foots');
|
|
SELECT ts_lexize('hunspell', 'rebookings');
|
|
SELECT ts_lexize('hunspell', 'rebooking');
|
|
SELECT ts_lexize('hunspell', 'rebook');
|
|
SELECT ts_lexize('hunspell', 'unbookings');
|
|
SELECT ts_lexize('hunspell', 'unbooking');
|
|
SELECT ts_lexize('hunspell', 'unbook');
|
|
|
|
SELECT ts_lexize('hunspell', 'footklubber');
|
|
SELECT ts_lexize('hunspell', 'footballklubber');
|
|
SELECT ts_lexize('hunspell', 'ballyklubber');
|
|
SELECT ts_lexize('hunspell', 'footballyklubber');
|
|
|
|
-- Test ISpell dictionary with hunspell affix file with FLAG long parameter
|
|
CREATE TEXT SEARCH DICTIONARY hunspell_long (
|
|
Template=ispell,
|
|
DictFile=hunspell_sample_long,
|
|
AffFile=hunspell_sample_long
|
|
);
|
|
|
|
SELECT ts_lexize('hunspell_long', 'skies');
|
|
SELECT ts_lexize('hunspell_long', 'bookings');
|
|
SELECT ts_lexize('hunspell_long', 'booking');
|
|
SELECT ts_lexize('hunspell_long', 'foot');
|
|
SELECT ts_lexize('hunspell_long', 'foots');
|
|
SELECT ts_lexize('hunspell_long', 'rebookings');
|
|
SELECT ts_lexize('hunspell_long', 'rebooking');
|
|
SELECT ts_lexize('hunspell_long', 'rebook');
|
|
SELECT ts_lexize('hunspell_long', 'unbookings');
|
|
SELECT ts_lexize('hunspell_long', 'unbooking');
|
|
SELECT ts_lexize('hunspell_long', 'unbook');
|
|
SELECT ts_lexize('hunspell_long', 'booked');
|
|
|
|
SELECT ts_lexize('hunspell_long', 'footklubber');
|
|
SELECT ts_lexize('hunspell_long', 'footballklubber');
|
|
SELECT ts_lexize('hunspell_long', 'ballyklubber');
|
|
SELECT ts_lexize('hunspell_long', 'ballsklubber');
|
|
SELECT ts_lexize('hunspell_long', 'footballyklubber');
|
|
SELECT ts_lexize('hunspell_long', 'ex-machina');
|
|
|
|
-- Test ISpell dictionary with hunspell affix file with FLAG num parameter
|
|
CREATE TEXT SEARCH DICTIONARY hunspell_num (
|
|
Template=ispell,
|
|
DictFile=hunspell_sample_num,
|
|
AffFile=hunspell_sample_num
|
|
);
|
|
|
|
SELECT ts_lexize('hunspell_num', 'skies');
|
|
SELECT ts_lexize('hunspell_num', 'sk');
|
|
SELECT ts_lexize('hunspell_num', 'bookings');
|
|
SELECT ts_lexize('hunspell_num', 'booking');
|
|
SELECT ts_lexize('hunspell_num', 'foot');
|
|
SELECT ts_lexize('hunspell_num', 'foots');
|
|
SELECT ts_lexize('hunspell_num', 'rebookings');
|
|
SELECT ts_lexize('hunspell_num', 'rebooking');
|
|
SELECT ts_lexize('hunspell_num', 'rebook');
|
|
SELECT ts_lexize('hunspell_num', 'unbookings');
|
|
SELECT ts_lexize('hunspell_num', 'unbooking');
|
|
SELECT ts_lexize('hunspell_num', 'unbook');
|
|
SELECT ts_lexize('hunspell_num', 'booked');
|
|
|
|
SELECT ts_lexize('hunspell_num', 'footklubber');
|
|
SELECT ts_lexize('hunspell_num', 'footballklubber');
|
|
SELECT ts_lexize('hunspell_num', 'ballyklubber');
|
|
SELECT ts_lexize('hunspell_num', 'footballyklubber');
|
|
|
|
-- Test suitability of affix and dict files
|
|
CREATE TEXT SEARCH DICTIONARY hunspell_err (
|
|
Template=ispell,
|
|
DictFile=ispell_sample,
|
|
AffFile=hunspell_sample_long
|
|
);
|
|
|
|
CREATE TEXT SEARCH DICTIONARY hunspell_err (
|
|
Template=ispell,
|
|
DictFile=ispell_sample,
|
|
AffFile=hunspell_sample_num
|
|
);
|
|
|
|
CREATE TEXT SEARCH DICTIONARY hunspell_invalid_1 (
|
|
Template=ispell,
|
|
DictFile=hunspell_sample_long,
|
|
AffFile=ispell_sample
|
|
);
|
|
|
|
CREATE TEXT SEARCH DICTIONARY hunspell_invalid_2 (
|
|
Template=ispell,
|
|
DictFile=hunspell_sample_long,
|
|
AffFile=hunspell_sample_num
|
|
);
|
|
|
|
CREATE TEXT SEARCH DICTIONARY hunspell_invalid_3 (
|
|
Template=ispell,
|
|
DictFile=hunspell_sample_num,
|
|
AffFile=ispell_sample
|
|
);
|
|
|
|
CREATE TEXT SEARCH DICTIONARY hunspell_err (
|
|
Template=ispell,
|
|
DictFile=hunspell_sample_num,
|
|
AffFile=hunspell_sample_long
|
|
);
|
|
|
|
-- Synonym dictionary
|
|
CREATE TEXT SEARCH DICTIONARY synonym (
|
|
Template=synonym,
|
|
Synonyms=synonym_sample
|
|
);
|
|
|
|
SELECT ts_lexize('synonym', 'PoStGrEs');
|
|
SELECT ts_lexize('synonym', 'Gogle');
|
|
SELECT ts_lexize('synonym', 'indices');
|
|
|
|
-- test altering boolean parameters
|
|
SELECT dictinitoption FROM pg_ts_dict WHERE dictname = 'synonym';
|
|
|
|
ALTER TEXT SEARCH DICTIONARY synonym (CaseSensitive = 1);
|
|
SELECT ts_lexize('synonym', 'PoStGrEs');
|
|
SELECT dictinitoption FROM pg_ts_dict WHERE dictname = 'synonym';
|
|
|
|
ALTER TEXT SEARCH DICTIONARY synonym (CaseSensitive = 2); -- fail
|
|
|
|
ALTER TEXT SEARCH DICTIONARY synonym (CaseSensitive = off);
|
|
SELECT ts_lexize('synonym', 'PoStGrEs');
|
|
SELECT dictinitoption FROM pg_ts_dict WHERE dictname = 'synonym';
|
|
|
|
-- Create and simple test thesaurus dictionary
|
|
-- More tests in configuration checks because ts_lexize()
|
|
-- cannot pass more than one word to thesaurus.
|
|
CREATE TEXT SEARCH DICTIONARY thesaurus (
|
|
Template=thesaurus,
|
|
DictFile=thesaurus_sample,
|
|
Dictionary=english_stem
|
|
);
|
|
|
|
SELECT ts_lexize('thesaurus', 'one');
|
|
|
|
-- Test ispell dictionary in configuration
|
|
CREATE TEXT SEARCH CONFIGURATION ispell_tst (
|
|
COPY=english
|
|
);
|
|
|
|
ALTER TEXT SEARCH CONFIGURATION ispell_tst ALTER MAPPING FOR
|
|
word, numword, asciiword, hword, numhword, asciihword, hword_part, hword_numpart, hword_asciipart
|
|
WITH ispell, english_stem;
|
|
|
|
SELECT to_tsvector('ispell_tst', 'Booking the skies after rebookings for footballklubber from a foot');
|
|
SELECT to_tsquery('ispell_tst', 'footballklubber');
|
|
SELECT to_tsquery('ispell_tst', 'footballyklubber:b & rebookings:A & sky');
|
|
|
|
-- Test ispell dictionary with hunspell affix in configuration
|
|
CREATE TEXT SEARCH CONFIGURATION hunspell_tst (
|
|
COPY=ispell_tst
|
|
);
|
|
|
|
ALTER TEXT SEARCH CONFIGURATION hunspell_tst ALTER MAPPING
|
|
REPLACE ispell WITH hunspell;
|
|
|
|
SELECT to_tsvector('hunspell_tst', 'Booking the skies after rebookings for footballklubber from a foot');
|
|
SELECT to_tsquery('hunspell_tst', 'footballklubber');
|
|
SELECT to_tsquery('hunspell_tst', 'footballyklubber:b & rebookings:A & sky');
|
|
|
|
SELECT to_tsquery('hunspell_tst', 'footballyklubber:b <-> sky');
|
|
SELECT phraseto_tsquery('hunspell_tst', 'footballyklubber sky');
|
|
|
|
-- Test ispell dictionary with hunspell affix with FLAG long in configuration
|
|
ALTER TEXT SEARCH CONFIGURATION hunspell_tst ALTER MAPPING
|
|
REPLACE hunspell WITH hunspell_long;
|
|
|
|
SELECT to_tsvector('hunspell_tst', 'Booking the skies after rebookings for footballklubber from a foot');
|
|
SELECT to_tsquery('hunspell_tst', 'footballklubber');
|
|
SELECT to_tsquery('hunspell_tst', 'footballyklubber:b & rebookings:A & sky');
|
|
|
|
-- Test ispell dictionary with hunspell affix with FLAG num in configuration
|
|
ALTER TEXT SEARCH CONFIGURATION hunspell_tst ALTER MAPPING
|
|
REPLACE hunspell_long WITH hunspell_num;
|
|
|
|
SELECT to_tsvector('hunspell_tst', 'Booking the skies after rebookings for footballklubber from a foot');
|
|
SELECT to_tsquery('hunspell_tst', 'footballklubber');
|
|
SELECT to_tsquery('hunspell_tst', 'footballyklubber:b & rebookings:A & sky');
|
|
|
|
-- Test synonym dictionary in configuration
|
|
CREATE TEXT SEARCH CONFIGURATION synonym_tst (
|
|
COPY=english
|
|
);
|
|
|
|
ALTER TEXT SEARCH CONFIGURATION synonym_tst ALTER MAPPING FOR
|
|
asciiword, hword_asciipart, asciihword
|
|
WITH synonym, english_stem;
|
|
|
|
SELECT to_tsvector('synonym_tst', 'Postgresql is often called as postgres or pgsql and pronounced as postgre');
|
|
SELECT to_tsvector('synonym_tst', 'Most common mistake is to write Gogle instead of Google');
|
|
SELECT to_tsvector('synonym_tst', 'Indexes or indices - Which is right plural form of index?');
|
|
SELECT to_tsquery('synonym_tst', 'Index & indices');
|
|
|
|
-- test thesaurus in configuration
|
|
-- see thesaurus_sample.ths to understand 'odd' resulting tsvector
|
|
CREATE TEXT SEARCH CONFIGURATION thesaurus_tst (
|
|
COPY=synonym_tst
|
|
);
|
|
|
|
ALTER TEXT SEARCH CONFIGURATION thesaurus_tst ALTER MAPPING FOR
|
|
asciiword, hword_asciipart, asciihword
|
|
WITH synonym, thesaurus, english_stem;
|
|
|
|
SELECT to_tsvector('thesaurus_tst', 'one postgres one two one two three one');
|
|
SELECT to_tsvector('thesaurus_tst', 'Supernovae star is very new star and usually called supernovae (abbreviation SN)');
|
|
SELECT to_tsvector('thesaurus_tst', 'Booking tickets is looking like a booking a tickets');
|
|
|
|
-- invalid: non-lowercase quoted identifiers
|
|
CREATE TEXT SEARCH DICTIONARY tsdict_case
|
|
(
|
|
Template = ispell,
|
|
"DictFile" = ispell_sample,
|
|
"AffFile" = ispell_sample
|
|
);
|
|
|
|
-- Test grammar for configurations
|
|
CREATE TEXT SEARCH CONFIGURATION dummy_tst (COPY=english);
|
|
-- Overriden mapping change with duplicated tokens.
|
|
ALTER TEXT SEARCH CONFIGURATION dummy_tst
|
|
ALTER MAPPING FOR word, word WITH ispell;
|
|
-- Not a token supported by the configuration's parser, fails.
|
|
ALTER TEXT SEARCH CONFIGURATION dummy_tst
|
|
DROP MAPPING FOR not_a_token, not_a_token;
|
|
-- Not a token supported by the configuration's parser, fails even
|
|
-- with IF EXISTS.
|
|
ALTER TEXT SEARCH CONFIGURATION dummy_tst
|
|
DROP MAPPING IF EXISTS FOR not_a_token, not_a_token;
|
|
-- Token supported by the configuration's parser, succeeds.
|
|
ALTER TEXT SEARCH CONFIGURATION dummy_tst
|
|
DROP MAPPING FOR word, word;
|
|
-- No mapping for token supported by the configuration's parser, fails.
|
|
ALTER TEXT SEARCH CONFIGURATION dummy_tst
|
|
DROP MAPPING FOR word;
|
|
-- Token supported by the configuration's parser, cannot be found,
|
|
-- succeeds with IF EXISTS.
|
|
ALTER TEXT SEARCH CONFIGURATION dummy_tst
|
|
DROP MAPPING IF EXISTS FOR word, word;
|
|
-- Re-add mapping, with duplicated tokens supported by the parser.
|
|
ALTER TEXT SEARCH CONFIGURATION dummy_tst
|
|
ADD MAPPING FOR word, word WITH ispell;
|
|
-- Not a token supported by the configuration's parser, fails.
|
|
ALTER TEXT SEARCH CONFIGURATION dummy_tst
|
|
ADD MAPPING FOR not_a_token WITH ispell;
|
|
DROP TEXT SEARCH CONFIGURATION dummy_tst;
|