Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit b04e70b

Browse files
tglsfdctglsfdc
committed
Adjust tsearch2.sql to avoid use of COPY FROM STDIN, so as to
simplify life for the Win32 installer. Per Dave Page.
1 parent 4f7d3e0 commit b04e70b

File tree

2 files changed

+63
-65
lines changed

2 files changed

+63
-65
lines changed

‎contrib/tsearch2/expected/tsearch2.out

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@ psql:tsearch2.sql:13: NOTICE: CREATE TABLE / PRIMARY KEY will create implicit i
77
psql:tsearch2.sql:145: NOTICE: CREATE TABLE / PRIMARY KEY will create implicit index "pg_ts_parser_pkey" for table "pg_ts_parser"
88
psql:tsearch2.sql:244: NOTICE: CREATE TABLE / PRIMARY KEY will create implicit index "pg_ts_cfg_pkey" for table "pg_ts_cfg"
99
psql:tsearch2.sql:251: NOTICE: CREATE TABLE / PRIMARY KEY will create implicit index "pg_ts_cfgmap_pkey" for table "pg_ts_cfgmap"
10-
psql:tsearch2.sql:339: NOTICE: type "tsvector" is not yet defined
10+
psql:tsearch2.sql:337: NOTICE: type "tsvector" is not yet defined
1111
DETAIL: Creating a shell type definition.
12-
psql:tsearch2.sql:344: NOTICE: argument type tsvector is only a shell
13-
psql:tsearch2.sql:398: NOTICE: type "tsquery" is not yet defined
12+
psql:tsearch2.sql:342: NOTICE: argument type tsvector is only a shell
13+
psql:tsearch2.sql:396: NOTICE: type "tsquery" is not yet defined
1414
DETAIL: Creating a shell type definition.
15-
psql:tsearch2.sql:403: NOTICE: argument type tsquery is only a shell
16-
psql:tsearch2.sql:545: NOTICE: type "gtsvector" is not yet defined
15+
psql:tsearch2.sql:401: NOTICE: argument type tsquery is only a shell
16+
psql:tsearch2.sql:543: NOTICE: type "gtsvector" is not yet defined
1717
DETAIL: Creating a shell type definition.
18-
psql:tsearch2.sql:550: NOTICE: argument type gtsvector is only a shell
18+
psql:tsearch2.sql:548: NOTICE: argument type gtsvector is only a shell
1919
--tsvector
2020
SELECT '1'::tsvector;
2121
tsvector

‎contrib/tsearch2/tsearch.sql.in

Lines changed: 57 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -272,65 +272,63 @@ insert into pg_ts_cfg values ('default', 'default','C');
272272
insert into pg_ts_cfg values ('default_russian', 'default','ru_RU.KOI8-R');
273273
insert into pg_ts_cfg values ('simple', 'default');
274274

275-
copy pg_ts_cfgmap from stdin;
276-
default lword {en_stem}
277-
default nlword {simple}
278-
default word {simple}
279-
default email {simple}
280-
default url {simple}
281-
default host {simple}
282-
default sfloat {simple}
283-
default version {simple}
284-
default part_hword {simple}
285-
default nlpart_hword {simple}
286-
default lpart_hword {en_stem}
287-
default hword {simple}
288-
default lhword {en_stem}
289-
default nlhword {simple}
290-
default uri {simple}
291-
default file {simple}
292-
default float {simple}
293-
default int {simple}
294-
default uint {simple}
295-
default_russian lword {en_stem}
296-
default_russian nlword {ru_stem}
297-
default_russian word {ru_stem}
298-
default_russian email {simple}
299-
default_russian url {simple}
300-
default_russian host {simple}
301-
default_russian sfloat {simple}
302-
default_russian version {simple}
303-
default_russian part_hword {simple}
304-
default_russian nlpart_hword {ru_stem}
305-
default_russian lpart_hword {en_stem}
306-
default_russian hword {ru_stem}
307-
default_russian lhword {en_stem}
308-
default_russian nlhword {ru_stem}
309-
default_russian uri {simple}
310-
default_russian file {simple}
311-
default_russian float {simple}
312-
default_russian int {simple}
313-
default_russian uint {simple}
314-
simple lword {simple}
315-
simple nlword {simple}
316-
simple word {simple}
317-
simple email {simple}
318-
simple url {simple}
319-
simple host {simple}
320-
simple sfloat {simple}
321-
simple version {simple}
322-
simple part_hword {simple}
323-
simple nlpart_hword {simple}
324-
simple lpart_hword {simple}
325-
simple hword {simple}
326-
simple lhword {simple}
327-
simple nlhword {simple}
328-
simple uri {simple}
329-
simple file {simple}
330-
simple float {simple}
331-
simple int {simple}
332-
simple uint {simple}
333-
\.
275+
insert into pg_ts_cfgmap values ('default', 'lword', '{en_stem}');
276+
insert into pg_ts_cfgmap values ('default', 'nlword', '{simple}');
277+
insert into pg_ts_cfgmap values ('default', 'word', '{simple}');
278+
insert into pg_ts_cfgmap values ('default', 'email', '{simple}');
279+
insert into pg_ts_cfgmap values ('default', 'url', '{simple}');
280+
insert into pg_ts_cfgmap values ('default', 'host', '{simple}');
281+
insert into pg_ts_cfgmap values ('default', 'sfloat', '{simple}');
282+
insert into pg_ts_cfgmap values ('default', 'version', '{simple}');
283+
insert into pg_ts_cfgmap values ('default', 'part_hword', '{simple}');
284+
insert into pg_ts_cfgmap values ('default', 'nlpart_hword', '{simple}');
285+
insert into pg_ts_cfgmap values ('default', 'lpart_hword', '{en_stem}');
286+
insert into pg_ts_cfgmap values ('default', 'hword', '{simple}');
287+
insert into pg_ts_cfgmap values ('default', 'lhword', '{en_stem}');
288+
insert into pg_ts_cfgmap values ('default', 'nlhword', '{simple}');
289+
insert into pg_ts_cfgmap values ('default', 'uri', '{simple}');
290+
insert into pg_ts_cfgmap values ('default', 'file', '{simple}');
291+
insert into pg_ts_cfgmap values ('default', 'float', '{simple}');
292+
insert into pg_ts_cfgmap values ('default', 'int', '{simple}');
293+
insert into pg_ts_cfgmap values ('default', 'uint', '{simple}');
294+
insert into pg_ts_cfgmap values ('default_russian', 'lword', '{en_stem}');
295+
insert into pg_ts_cfgmap values ('default_russian', 'nlword', '{ru_stem}');
296+
insert into pg_ts_cfgmap values ('default_russian', 'word', '{ru_stem}');
297+
insert into pg_ts_cfgmap values ('default_russian', 'email', '{simple}');
298+
insert into pg_ts_cfgmap values ('default_russian', 'url', '{simple}');
299+
insert into pg_ts_cfgmap values ('default_russian', 'host', '{simple}');
300+
insert into pg_ts_cfgmap values ('default_russian', 'sfloat', '{simple}');
301+
insert into pg_ts_cfgmap values ('default_russian', 'version', '{simple}');
302+
insert into pg_ts_cfgmap values ('default_russian', 'part_hword', '{simple}');
303+
insert into pg_ts_cfgmap values ('default_russian', 'nlpart_hword', '{ru_stem}');
304+
insert into pg_ts_cfgmap values ('default_russian', 'lpart_hword', '{en_stem}');
305+
insert into pg_ts_cfgmap values ('default_russian', 'hword', '{ru_stem}');
306+
insert into pg_ts_cfgmap values ('default_russian', 'lhword', '{en_stem}');
307+
insert into pg_ts_cfgmap values ('default_russian', 'nlhword', '{ru_stem}');
308+
insert into pg_ts_cfgmap values ('default_russian', 'uri', '{simple}');
309+
insert into pg_ts_cfgmap values ('default_russian', 'file', '{simple}');
310+
insert into pg_ts_cfgmap values ('default_russian', 'float', '{simple}');
311+
insert into pg_ts_cfgmap values ('default_russian', 'int', '{simple}');
312+
insert into pg_ts_cfgmap values ('default_russian', 'uint', '{simple}');
313+
insert into pg_ts_cfgmap values ('simple', 'lword', '{simple}');
314+
insert into pg_ts_cfgmap values ('simple', 'nlword', '{simple}');
315+
insert into pg_ts_cfgmap values ('simple', 'word', '{simple}');
316+
insert into pg_ts_cfgmap values ('simple', 'email', '{simple}');
317+
insert into pg_ts_cfgmap values ('simple', 'url', '{simple}');
318+
insert into pg_ts_cfgmap values ('simple', 'host', '{simple}');
319+
insert into pg_ts_cfgmap values ('simple', 'sfloat', '{simple}');
320+
insert into pg_ts_cfgmap values ('simple', 'version', '{simple}');
321+
insert into pg_ts_cfgmap values ('simple', 'part_hword', '{simple}');
322+
insert into pg_ts_cfgmap values ('simple', 'nlpart_hword', '{simple}');
323+
insert into pg_ts_cfgmap values ('simple', 'lpart_hword', '{simple}');
324+
insert into pg_ts_cfgmap values ('simple', 'hword', '{simple}');
325+
insert into pg_ts_cfgmap values ('simple', 'lhword', '{simple}');
326+
insert into pg_ts_cfgmap values ('simple', 'nlhword', '{simple}');
327+
insert into pg_ts_cfgmap values ('simple', 'uri', '{simple}');
328+
insert into pg_ts_cfgmap values ('simple', 'file', '{simple}');
329+
insert into pg_ts_cfgmap values ('simple', 'float', '{simple}');
330+
insert into pg_ts_cfgmap values ('simple', 'int', '{simple}');
331+
insert into pg_ts_cfgmap values ('simple', 'uint', '{simple}');
334332

335333
--tsvector type
336334
CREATE FUNCTION tsvector_in(cstring)

0 commit comments

Comments
 (0)