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

Commitd33faa2

Browse files
committed
Move the built-in conversions into the initial catalog data.
Instead of running a SQL script to create the standard conversionfunctions and pg_conversion entries, put those entries into theinitial data in postgres.bki.This shaves a few percent off the runtime of initdb, and also allowsaccurate comments to be attached to the conversion functions; theprevious script labeled them with machine-generated comments thatwere not quite right for multi-purpose conversion functions.Also, we can get rid of the duplicative Makefile and MSVC perlimplementations of the generation code for that SQL script.A functional change is that these pg_proc and pg_conversion entriesare now "pinned" by initdb. Leaving them unpinned was perhaps agood thing back while the conversions feature was under development,but there seems no valid reason for it now.Also, the conversion functions are now marked as immutable, wherebefore they were volatile by virtue of lacking any explicitspecification. That seems like it was just an oversight.To avoid using magic constants in pg_conversion.dat, extendgenbki.pl to allow encoding names to be converted, much as itdoes for language, access method, etc names.John NaylorDiscussion:https://postgr.es/m/CAJVSVGWtUqxpfAaxS88vEGvi+jKzWZb2EStu5io-UPc4p9rSJg@mail.gmail.com
1 parent814c901 commitd33faa2

File tree

13 files changed

+912
-273
lines changed

13 files changed

+912
-273
lines changed

‎doc/src/sgml/bki.sgml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -410,7 +410,7 @@
410410
catalogs, <filename>genbki.pl</filename> provides mechanisms to write
411411
symbolic references instead. Currently this is possible for references
412412
to access methods, functions, languages,
413-
operators, opclasses, opfamilies, andtypes.
413+
operators, opclasses, opfamilies,types,andencodings.
414414
The rules are as follows:
415415
</para>
416416

@@ -424,11 +424,16 @@
424424
is <literal>pg_am</literal>, <literal>pg_proc</literal>,
425425
<literal>pg_language</literal>,
426426
<literal>pg_operator</literal>, <literal>pg_opclass</literal>,
427-
<literal>pg_opfamily</literal>, or <literal>pg_type</literal>.
427+
<literal>pg_opfamily</literal>,
428+
<literal>pg_type</literal>,
429+
or <literal>encoding</literal>.
428430
<literal>BKI_LOOKUP</literal> can be attached to columns of
429431
type <type>Oid</type>, <type>regproc</type>, <type>oidvector</type>,
430432
or <type>Oid[]</type>; in the latter two cases it implies performing a
431433
lookup on each element of the array.
434+
It's also permissible to attach <literal>BKI_LOOKUP</literal>
435+
to integer columns; this should be done only for encodings,
436+
which are not currently represented as catalog OIDs.
432437
</para>
433438
</listitem>
434439

‎src/backend/catalog/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ POSTGRES_BKI_SRCS := $(addprefix $(top_srcdir)/src/include/catalog/,\
6060
# The .dat files we need can just be listed alphabetically.
6161
POSTGRES_BKI_DATA =$(addprefix$(top_srcdir)/src/include/catalog/,\
6262
pg_aggregate.dat pg_am.dat pg_amop.dat pg_amproc.dat pg_authid.dat \
63-
pg_cast.dat pg_class.dat pg_collation.dat \
63+
pg_cast.dat pg_class.dat pg_collation.datpg_conversion.dat\
6464
pg_database.dat pg_language.dat \
6565
pg_namespace.dat pg_opclass.dat pg_operator.dat pg_opfamily.dat \
6666
pg_pltemplate.dat pg_proc.dat pg_range.dat pg_tablespace.dat \

‎src/backend/catalog/genbki.pl

Lines changed: 42 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -57,11 +57,15 @@
5757
die"--set-version must be specified.\n"if !defined$major_version;
5858
die"-I, the header include path, must be specified.\n"if !$include_path;
5959

60-
# Make sureoutput_path ends in a slash.
60+
# Make surepaths end with a slash.
6161
if ($output_pathne'' &&substr($output_path, -1)ne'/')
6262
{
6363
$output_path .='/';
6464
}
65+
if (substr($include_path, -1)ne'/')
66+
{
67+
$include_path .='/';
68+
}
6569

6670
# Read all the files into internal data structures.
6771
my@catnames;
@@ -175,8 +179,7 @@
175179
'PG_CATALOG_NAMESPACE');
176180

177181

178-
# Build lookup tables for OID macro substitutions and for pg_attribute
179-
# copies of pg_type values.
182+
# Build lookup tables.
180183

181184
# access method OID lookup
182185
my%amoids;
@@ -259,19 +262,53 @@
259262
my%types;
260263
foreachmy$row (@{$catalog_data{pg_type} })
261264
{
265+
# for OID macro substitutions
262266
$typeoids{$row->{typname} } =$row->{oid};
267+
268+
# for pg_attribute copies of pg_type values
263269
$types{$row->{typname} } =$row;
264270
}
265271

266-
# Map catalog name to OID lookup.
272+
# Encoding identifier lookup. This uses the same replacement machinery
273+
# as for OIDs, but we have to dig the values out of pg_wchar.h.
274+
my%encids;
275+
276+
my$encfile =$include_path .'mb/pg_wchar.h';
277+
open(my$ef,'<',$encfile) ||die"$encfile:$!";
278+
279+
# We're parsing an enum, so start with 0 and increment
280+
# every time we find an enum member.
281+
my$encid = 0;
282+
my$collect_encodings = 0;
283+
while (<$ef>)
284+
{
285+
if (/typedef\s+enum\s+pg_enc/)
286+
{
287+
$collect_encodings = 1;
288+
next;
289+
}
290+
291+
lastif/_PG_LAST_ENCODING_/;
292+
293+
if ($collect_encodingsand /^\s+(PG_\w+)/)
294+
{
295+
$encids{$1} =$encid;
296+
$encid++;
297+
}
298+
}
299+
300+
close$ef;
301+
302+
# Map lookup name to the corresponding hash table.
267303
my%lookup_kind = (
268304
pg_am =>\%amoids,
269305
pg_language =>\%langoids,
270306
pg_opclass =>\%opcoids,
271307
pg_operator =>\%operoids,
272308
pg_opfamily =>\%opfoids,
273309
pg_proc =>\%procoids,
274-
pg_type=> \%typeoids);
310+
pg_type =>\%typeoids,
311+
encoding =>\%encids);
275312
276313
277314
# Open temp files

‎src/backend/utils/mb/conversion_procs/.gitignore

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 5 additions & 174 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,18 @@
11
#-------------------------------------------------------------------------
22
#
3-
# Makefile--
4-
# Makefile for utils/mb/conversion_procs
3+
# Makefile for backend/utils/mb/conversion_procs
54
#
6-
# IDENTIFICATION
7-
# src/backend/utils/mb/conversion_procs/Makefile
5+
# Portions Copyright (c) 1996-2019, PostgreSQL Global Development Group
6+
# Portions Copyright (c) 1994, Regents of the University of California
7+
#
8+
# src/backend/utils/mb/conversion_procs/Makefile
89
#
910
#-------------------------------------------------------------------------
1011

1112
subdir = src/backend/utils/mb/conversion_procs
1213
top_builddir = ../../../../..
1314
include$(top_builddir)/src/Makefile.global
1415

15-
SQLSCRIPT = conversion_create.sql
16-
1716
SUBDIRS =\
1817
ascii_and_mic cyrillic_and_mic euc_cn_and_mic euc_jp_and_sjis\
1918
euc_kr_and_mic euc_tw_and_big5 latin2_and_win1250 latin_and_mic\
@@ -24,171 +23,3 @@ SUBDIRS = \
2423
utf8_and_euc2004 utf8_and_sjis2004 euc2004_sjis2004
2524

2625
$(recurse)
27-
28-
# conversion_name source_encoding destination_encoding function object
29-
CONVERSIONS =\
30-
ascii_to_micSQL_ASCII MULE_INTERNAL ascii_to_mic ascii_and_mic\
31-
mic_to_asciiMULE_INTERNAL SQL_ASCII mic_to_ascii ascii_and_mic\
32-
koi8_r_to_micKOI8R MULE_INTERNAL koi8r_to_mic cyrillic_and_mic\
33-
mic_to_koi8_rMULE_INTERNAL KOI8R mic_to_koi8r cyrillic_and_mic\
34-
iso_8859_5_to_micISO-8859-5 MULE_INTERNAL iso_to_mic cyrillic_and_mic\
35-
mic_to_iso_8859_5MULE_INTERNAL ISO-8859-5 mic_to_iso cyrillic_and_mic\
36-
windows_1251_to_micWIN1251 MULE_INTERNAL win1251_to_mic cyrillic_and_mic\
37-
mic_to_windows_1251MULE_INTERNAL WIN1251 mic_to_win1251 cyrillic_and_mic\
38-
windows_866_to_micWIN866 MULE_INTERNAL win866_to_mic cyrillic_and_mic\
39-
mic_to_windows_866MULE_INTERNAL WIN866 mic_to_win866 cyrillic_and_mic\
40-
koi8_r_to_windows_1251 KOI8R WIN1251 koi8r_to_win1251 cyrillic_and_mic\
41-
windows_1251_to_koi8_r WIN1251 KOI8R win1251_to_koi8r cyrillic_and_mic\
42-
koi8_r_to_windows_866KOI8R WIN866 koi8r_to_win866 cyrillic_and_mic\
43-
windows_866_to_koi8_rWIN866 KOI8R win866_to_koi8r cyrillic_and_mic\
44-
windows_866_to_windows_1251WIN866 WIN1251 win866_to_win1251 cyrillic_and_mic\
45-
windows_1251_to_windows_866WIN1251WIN866 win1251_to_win866 cyrillic_and_mic\
46-
iso_8859_5_to_koi8_rISO-8859-5 KOI8R iso_to_koi8r cyrillic_and_mic\
47-
koi8_r_to_iso_8859_5KOI8R ISO-8859-5 koi8r_to_iso cyrillic_and_mic\
48-
iso_8859_5_to_windows_1251ISO-8859-5 WIN1251 iso_to_win1251 cyrillic_and_mic\
49-
windows_1251_to_iso_8859_5WIN1251 ISO-8859-5 win1251_to_iso cyrillic_and_mic\
50-
iso_8859_5_to_windows_866ISO-8859-5 WIN866 iso_to_win866 cyrillic_and_mic\
51-
windows_866_to_iso_8859_5WIN866 ISO-8859-5 win866_to_iso cyrillic_and_mic\
52-
euc_cn_to_micEUC_CN MULE_INTERNAL euc_cn_to_mic euc_cn_and_mic\
53-
mic_to_euc_cnMULE_INTERNAL EUC_CN mic_to_euc_cn euc_cn_and_mic\
54-
euc_jp_to_sjisEUC_JP SJIS euc_jp_to_sjis euc_jp_and_sjis\
55-
sjis_to_euc_jpSJIS EUC_JP sjis_to_euc_jp euc_jp_and_sjis\
56-
euc_jp_to_micEUC_JP MULE_INTERNAL euc_jp_to_mic euc_jp_and_sjis\
57-
sjis_to_micSJIS MULE_INTERNAL sjis_to_mic euc_jp_and_sjis\
58-
mic_to_euc_jpMULE_INTERNAL EUC_JP mic_to_euc_jp euc_jp_and_sjis\
59-
mic_to_sjisMULE_INTERNAL SJIS mic_to_sjis euc_jp_and_sjis\
60-
euc_kr_to_micEUC_KR MULE_INTERNAL euc_kr_to_mic euc_kr_and_mic\
61-
mic_to_euc_krMULE_INTERNAL EUC_KR mic_to_euc_kr euc_kr_and_mic\
62-
euc_tw_to_big5EUC_TW BIG5 euc_tw_to_big5 euc_tw_and_big5\
63-
big5_to_euc_twBIG5 EUC_TW big5_to_euc_tw euc_tw_and_big5\
64-
euc_tw_to_micEUC_TW MULE_INTERNAL euc_tw_to_mic euc_tw_and_big5\
65-
big5_to_micBIG5 MULE_INTERNAL big5_to_mic euc_tw_and_big5\
66-
mic_to_euc_twMULE_INTERNAL EUC_TW mic_to_euc_tw euc_tw_and_big5\
67-
mic_to_big5MULE_INTERNAL BIG5 mic_to_big5 euc_tw_and_big5\
68-
iso_8859_2_to_micLATIN2 MULE_INTERNAL latin2_to_mic latin2_and_win1250\
69-
mic_to_iso_8859_2MULE_INTERNAL LATIN2 mic_to_latin2 latin2_and_win1250\
70-
windows_1250_to_micWIN1250 MULE_INTERNAL win1250_to_mic latin2_and_win1250\
71-
mic_to_windows_1250MULE_INTERNAL WIN1250 mic_to_win1250 latin2_and_win1250\
72-
iso_8859_2_to_windows_1250 LATIN2 WIN1250 latin2_to_win1250 latin2_and_win1250\
73-
windows_1250_to_iso_8859_2 WIN1250 LATIN2 win1250_to_latin2 latin2_and_win1250\
74-
iso_8859_1_to_micLATIN1 MULE_INTERNAL latin1_to_mic latin_and_mic\
75-
mic_to_iso_8859_1MULE_INTERNAL LATIN1 mic_to_latin1 latin_and_mic\
76-
iso_8859_3_to_micLATIN3 MULE_INTERNAL latin3_to_mic latin_and_mic\
77-
mic_to_iso_8859_3MULE_INTERNAL LATIN3 mic_to_latin3 latin_and_mic\
78-
iso_8859_4_to_micLATIN4 MULE_INTERNAL latin4_to_mic latin_and_mic\
79-
mic_to_iso_8859_4MULE_INTERNAL LATIN4 mic_to_latin4 latin_and_mic\
80-
ascii_to_utf8 SQL_ASCII UTF8 ascii_to_utf8 utf8_and_ascii\
81-
utf8_to_ascii UTF8 SQL_ASCII utf8_to_ascii utf8_and_ascii\
82-
big5_to_utf8 BIG5 UTF8 big5_to_utf8 utf8_and_big5\
83-
utf8_to_big5 UTF8 BIG5 utf8_to_big5 utf8_and_big5\
84-
utf8_to_koi8_rUTF8 KOI8R utf8_to_koi8r utf8_and_cyrillic\
85-
koi8_r_to_utf8KOI8R UTF8 koi8r_to_utf8 utf8_and_cyrillic\
86-
utf8_to_koi8_uUTF8 KOI8U utf8_to_koi8u utf8_and_cyrillic\
87-
koi8_u_to_utf8KOI8U UTF8 koi8u_to_utf8 utf8_and_cyrillic\
88-
utf8_to_windows_866 UTF8 WIN866 utf8_to_win utf8_and_win\
89-
windows_866_to_utf8 WIN866 UTF8 win_to_utf8 utf8_and_win\
90-
utf8_to_windows_874 UTF8 WIN874 utf8_to_win utf8_and_win\
91-
windows_874_to_utf8 WIN874 UTF8 win_to_utf8 utf8_and_win\
92-
utf8_to_windows_1250 UTF8 WIN1250 utf8_to_win utf8_and_win\
93-
windows_1250_to_utf8 WIN1250 UTF8 win_to_utf8 utf8_and_win\
94-
utf8_to_windows_1251 UTF8 WIN1251 utf8_to_win utf8_and_win\
95-
windows_1251_to_utf8 WIN1251 UTF8 win_to_utf8 utf8_and_win\
96-
utf8_to_windows_1252 UTF8 WIN1252 utf8_to_win utf8_and_win\
97-
windows_1252_to_utf8 WIN1252 UTF8 win_to_utf8 utf8_and_win\
98-
utf8_to_windows_1253 UTF8 WIN1253 utf8_to_win utf8_and_win\
99-
windows_1253_to_utf8 WIN1253 UTF8 win_to_utf8 utf8_and_win\
100-
utf8_to_windows_1254 UTF8 WIN1254 utf8_to_win utf8_and_win\
101-
windows_1254_to_utf8 WIN1254 UTF8 win_to_utf8 utf8_and_win\
102-
utf8_to_windows_1255 UTF8 WIN1255 utf8_to_win utf8_and_win\
103-
windows_1255_to_utf8 WIN1255 UTF8 win_to_utf8 utf8_and_win\
104-
utf8_to_windows_1256 UTF8 WIN1256 utf8_to_win utf8_and_win\
105-
windows_1256_to_utf8 WIN1256 UTF8 win_to_utf8 utf8_and_win\
106-
utf8_to_windows_1257 UTF8 WIN1257 utf8_to_win utf8_and_win\
107-
windows_1257_to_utf8 WIN1257 UTF8 win_to_utf8 utf8_and_win\
108-
utf8_to_windows_1258 UTF8 WIN1258 utf8_to_win utf8_and_win\
109-
windows_1258_to_utf8 WIN1258 UTF8 win_to_utf8 utf8_and_win\
110-
euc_cn_to_utf8 EUC_CN UTF8 euc_cn_to_utf8 utf8_and_euc_cn\
111-
utf8_to_euc_cn UTF8 EUC_CN utf8_to_euc_cn utf8_and_euc_cn\
112-
euc_jp_to_utf8 EUC_JP UTF8 euc_jp_to_utf8 utf8_and_euc_jp\
113-
utf8_to_euc_jp UTF8 EUC_JP utf8_to_euc_jp utf8_and_euc_jp\
114-
euc_kr_to_utf8 EUC_KR UTF8 euc_kr_to_utf8 utf8_and_euc_kr\
115-
utf8_to_euc_kr UTF8 EUC_KR utf8_to_euc_kr utf8_and_euc_kr\
116-
euc_tw_to_utf8 EUC_TW UTF8 euc_tw_to_utf8 utf8_and_euc_tw\
117-
utf8_to_euc_tw UTF8 EUC_TW utf8_to_euc_tw utf8_and_euc_tw\
118-
gb18030_to_utf8 GB18030 UTF8 gb18030_to_utf8 utf8_and_gb18030\
119-
utf8_to_gb18030 UTF8 GB18030 utf8_to_gb18030 utf8_and_gb18030\
120-
gbk_to_utf8 GBK UTF8 gbk_to_utf8 utf8_and_gbk\
121-
utf8_to_gbk UTF8 GBK utf8_to_gbk utf8_and_gbk\
122-
utf8_to_iso_8859_2 UTF8 LATIN2 utf8_to_iso8859 utf8_and_iso8859\
123-
iso_8859_2_to_utf8 LATIN2 UTF8 iso8859_to_utf8 utf8_and_iso8859\
124-
utf8_to_iso_8859_3 UTF8 LATIN3 utf8_to_iso8859 utf8_and_iso8859\
125-
iso_8859_3_to_utf8 LATIN3 UTF8 iso8859_to_utf8 utf8_and_iso8859\
126-
utf8_to_iso_8859_4 UTF8 LATIN4 utf8_to_iso8859 utf8_and_iso8859\
127-
iso_8859_4_to_utf8 LATIN4 UTF8 iso8859_to_utf8 utf8_and_iso8859\
128-
utf8_to_iso_8859_9 UTF8 LATIN5 utf8_to_iso8859 utf8_and_iso8859\
129-
iso_8859_9_to_utf8 LATIN5 UTF8 iso8859_to_utf8 utf8_and_iso8859\
130-
utf8_to_iso_8859_10 UTF8 LATIN6 utf8_to_iso8859 utf8_and_iso8859\
131-
iso_8859_10_to_utf8 LATIN6 UTF8 iso8859_to_utf8 utf8_and_iso8859\
132-
utf8_to_iso_8859_13 UTF8 LATIN7 utf8_to_iso8859 utf8_and_iso8859\
133-
iso_8859_13_to_utf8 LATIN7 UTF8 iso8859_to_utf8 utf8_and_iso8859\
134-
utf8_to_iso_8859_14 UTF8 LATIN8 utf8_to_iso8859 utf8_and_iso8859\
135-
iso_8859_14_to_utf8 LATIN8 UTF8 iso8859_to_utf8 utf8_and_iso8859\
136-
utf8_to_iso_8859_15 UTF8 LATIN9 utf8_to_iso8859 utf8_and_iso8859\
137-
iso_8859_15_to_utf8 LATIN9 UTF8 iso8859_to_utf8 utf8_and_iso8859\
138-
utf8_to_iso_8859_16 UTF8 LATIN10 utf8_to_iso8859 utf8_and_iso8859\
139-
iso_8859_16_to_utf8 LATIN10 UTF8 iso8859_to_utf8 utf8_and_iso8859\
140-
utf8_to_iso_8859_5 UTF8 ISO-8859-5 utf8_to_iso8859 utf8_and_iso8859\
141-
iso_8859_5_to_utf8 ISO-8859-5 UTF8 iso8859_to_utf8 utf8_and_iso8859\
142-
utf8_to_iso_8859_6 UTF8 ISO-8859-6 utf8_to_iso8859 utf8_and_iso8859\
143-
iso_8859_6_to_utf8 ISO-8859-6 UTF8 iso8859_to_utf8 utf8_and_iso8859\
144-
utf8_to_iso_8859_7 UTF8 ISO-8859-7 utf8_to_iso8859 utf8_and_iso8859\
145-
iso_8859_7_to_utf8 ISO-8859-7 UTF8 iso8859_to_utf8 utf8_and_iso8859\
146-
utf8_to_iso_8859_8 UTF8 ISO-8859-8 utf8_to_iso8859 utf8_and_iso8859\
147-
iso_8859_8_to_utf8 ISO-8859-8 UTF8 iso8859_to_utf8 utf8_and_iso8859\
148-
iso_8859_1_to_utf8 LATIN1 UTF8 iso8859_1_to_utf8 utf8_and_iso8859_1\
149-
utf8_to_iso_8859_1 UTF8 LATIN1 utf8_to_iso8859_1 utf8_and_iso8859_1\
150-
johab_to_utf8 JOHAB UTF8 johab_to_utf8 utf8_and_johab\
151-
utf8_to_johab UTF8 JOHAB utf8_to_johab utf8_and_johab\
152-
sjis_to_utf8 SJIS UTF8 sjis_to_utf8 utf8_and_sjis\
153-
utf8_to_sjis UTF8 SJIS utf8_to_sjis utf8_and_sjis\
154-
uhc_to_utf8 UHC UTF8 uhc_to_utf8 utf8_and_uhc\
155-
utf8_to_uhc UTF8 UHC utf8_to_uhc utf8_and_uhc\
156-
euc_jis_2004_to_utf8 EUC_JIS_2004 UTF8 euc_jis_2004_to_utf8 utf8_and_euc2004\
157-
utf8_to_euc_jis_2004 UTF8 EUC_JIS_2004 utf8_to_euc_jis_2004 utf8_and_euc2004\
158-
shift_jis_2004_to_utf8 SHIFT_JIS_2004 UTF8 shift_jis_2004_to_utf8 utf8_and_sjis2004\
159-
utf8_to_shift_jis_2004 UTF8 SHIFT_JIS_2004 utf8_to_shift_jis_2004 utf8_and_sjis2004\
160-
euc_jis_2004_to_shift_jis_2004 EUC_JIS_2004 SHIFT_JIS_2004 euc_jis_2004_to_shift_jis_2004 euc2004_sjis2004\
161-
shift_jis_2004_to_euc_jis_2004 SHIFT_JIS_2004 EUC_JIS_2004 shift_jis_2004_to_euc_jis_2004 euc2004_sjis2004
162-
163-
all:$(SQLSCRIPT)
164-
165-
$(SQLSCRIPT): Makefile
166-
@set -e;\
167-
set$(CONVERSIONS);\
168-
while ["$$#"-gt 0 ]; \
169-
do\
170-
name=$$1;shift;\
171-
se=$$1;shift;\
172-
de=$$1;shift;\
173-
func=$$1;shift;\
174-
obj=$$1;shift;\
175-
echo"--$$se -->$$de";\
176-
echo"CREATE OR REPLACE FUNCTION$$func (INTEGER, INTEGER, CSTRING, INTERNAL, INTEGER) RETURNS VOID AS '$$"libdir"/$$obj', '$$func' LANGUAGE C STRICT PARALLEL SAFE;";\
177-
echo"COMMENT ON FUNCTION$$func(INTEGER, INTEGER, CSTRING, INTERNAL, INTEGER) IS 'internal conversion function for$$se to$$de';";\
178-
echo"DROP CONVERSION pg_catalog.$$name;";\
179-
echo"CREATE DEFAULT CONVERSION pg_catalog.$$name FOR '$$se' TO '$$de' FROM$$func;";\
180-
echo"COMMENT ON CONVERSION pg_catalog.$$name IS 'conversion for$$se to$$de';";\
181-
echo;\
182-
done>$@
183-
184-
install:$(SQLSCRIPT) installdirs
185-
$(INSTALL_DATA)$(SQLSCRIPT)'$(DESTDIR)$(datadir)'
186-
187-
installdirs:
188-
$(MKDIR_P)'$(DESTDIR)$(datadir)''$(DESTDIR)$(pkglibdir)'
189-
190-
uninstall:
191-
rm -f'$(DESTDIR)$(datadir)/$(SQLSCRIPT)'
192-
193-
cleandistcleanmaintainer-clean:
194-
rm -f$(SQLSCRIPT)

‎src/bin/initdb/initdb.c

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,6 @@ static char *shdesc_file;
155155
staticchar*hba_file;
156156
staticchar*ident_file;
157157
staticchar*conf_file;
158-
staticchar*conversion_file;
159158
staticchar*dictionary_file;
160159
staticchar*info_schema_file;
161160
staticchar*features_file;
@@ -254,7 +253,6 @@ static void setup_depend(FILE *cmdfd);
254253
staticvoidsetup_sysviews(FILE*cmdfd);
255254
staticvoidsetup_description(FILE*cmdfd);
256255
staticvoidsetup_collation(FILE*cmdfd);
257-
staticvoidsetup_conversion(FILE*cmdfd);
258256
staticvoidsetup_dictionary(FILE*cmdfd);
259257
staticvoidsetup_privileges(FILE*cmdfd);
260258
staticvoidset_info_version(void);
@@ -1774,26 +1772,6 @@ setup_collation(FILE *cmdfd)
17741772
PG_CMD_PUTS("SELECT pg_import_system_collations('pg_catalog');\n\n");
17751773
}
17761774

1777-
/*
1778-
* load conversion functions
1779-
*/
1780-
staticvoid
1781-
setup_conversion(FILE*cmdfd)
1782-
{
1783-
char**line;
1784-
char**conv_lines;
1785-
1786-
conv_lines=readfile(conversion_file);
1787-
for (line=conv_lines;*line!=NULL;line++)
1788-
{
1789-
if (strstr(*line,"DROP CONVERSION")!=*line)
1790-
PG_CMD_PUTS(*line);
1791-
free(*line);
1792-
}
1793-
1794-
free(conv_lines);
1795-
}
1796-
17971775
/*
17981776
* load extra dictionaries (Snowball stemmers)
17991777
*/
@@ -2679,7 +2657,6 @@ setup_data_file_paths(void)
26792657
set_input(&hba_file,"pg_hba.conf.sample");
26802658
set_input(&ident_file,"pg_ident.conf.sample");
26812659
set_input(&conf_file,"postgresql.conf.sample");
2682-
set_input(&conversion_file,"conversion_create.sql");
26832660
set_input(&dictionary_file,"snowball_create.sql");
26842661
set_input(&info_schema_file,"information_schema.sql");
26852662
set_input(&features_file,"sql_features.txt");
@@ -2710,7 +2687,6 @@ setup_data_file_paths(void)
27102687
check_input(hba_file);
27112688
check_input(ident_file);
27122689
check_input(conf_file);
2713-
check_input(conversion_file);
27142690
check_input(dictionary_file);
27152691
check_input(info_schema_file);
27162692
check_input(features_file);
@@ -3070,8 +3046,6 @@ initialize_data_directory(void)
30703046

30713047
setup_collation(cmdfd);
30723048

3073-
setup_conversion(cmdfd);
3074-
30753049
setup_dictionary(cmdfd);
30763050

30773051
setup_privileges(cmdfd);

‎src/include/catalog/catversion.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,6 @@
5353
*/
5454

5555
/*yyyymmddN */
56-
#defineCATALOG_VERSION_NO201812311
56+
#defineCATALOG_VERSION_NO201901031
5757

5858
#endif

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp