Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitb04e70b

Browse files
committed
Adjust tsearch2.sql to avoid use of COPY FROM STDIN, so as to
simplify life for the Win32 installer. Per Dave Page.
1 parent4f7d3e0 commitb04e70b

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-
defaultlword{en_stem}
277-
defaultnlword{simple}
278-
defaultword{simple}
279-
defaultemail{simple}
280-
defaulturl{simple}
281-
defaulthost{simple}
282-
defaultsfloat{simple}
283-
defaultversion{simple}
284-
defaultpart_hword{simple}
285-
defaultnlpart_hword{simple}
286-
defaultlpart_hword{en_stem}
287-
defaulthword{simple}
288-
defaultlhword{en_stem}
289-
defaultnlhword{simple}
290-
defaulturi{simple}
291-
defaultfile{simple}
292-
defaultfloat{simple}
293-
defaultint{simple}
294-
defaultuint{simple}
295-
default_russianlword{en_stem}
296-
default_russiannlword{ru_stem}
297-
default_russianword{ru_stem}
298-
default_russianemail{simple}
299-
default_russianurl{simple}
300-
default_russianhost{simple}
301-
default_russiansfloat{simple}
302-
default_russianversion{simple}
303-
default_russianpart_hword{simple}
304-
default_russiannlpart_hword{ru_stem}
305-
default_russianlpart_hword{en_stem}
306-
default_russianhword{ru_stem}
307-
default_russianlhword{en_stem}
308-
default_russiannlhword{ru_stem}
309-
default_russianuri{simple}
310-
default_russianfile{simple}
311-
default_russianfloat{simple}
312-
default_russianint{simple}
313-
default_russianuint{simple}
314-
simplelword{simple}
315-
simplenlword{simple}
316-
simpleword{simple}
317-
simpleemail{simple}
318-
simpleurl{simple}
319-
simplehost{simple}
320-
simplesfloat{simple}
321-
simpleversion{simple}
322-
simplepart_hword{simple}
323-
simplenlpart_hword{simple}
324-
simplelpart_hword{simple}
325-
simplehword{simple}
326-
simplelhword{simple}
327-
simplenlhword{simple}
328-
simpleuri{simple}
329-
simplefile{simple}
330-
simplefloat{simple}
331-
simpleint{simple}
332-
simpleuint{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)
[8]ページ先頭
©2009-2025 Movatter.jp