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

Commit7ecef66

Browse files
committed
fix docs (replace copy with \t \o)
2 parents38923e2 +9dab425 commit7ecef66

File tree

540 files changed

+523362
-8608
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

540 files changed

+523362
-8608
lines changed

‎configure

Lines changed: 2027 additions & 155 deletions
Large diffs are not rendered by default.

‎configure.in

Lines changed: 86 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,14 @@ dnl Read the Autoconf manual for details.
1717
dnl
1818
m4_pattern_forbid(^PGAC_)dnl to catch undefined macros
1919

20-
AC_INIT([PostgresPro], [9.5.0.1], [pgsql-bugs@postgrespro.com])
20+
AC_INIT([PostgresPro], [9.5.1.3], [pgsql-bugs@postgrespro.com])
2121

2222
m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.69], [], [m4_fatal([Autoconf version 2.69 is required.
2323
Untested combinations of 'autoconf' and PostgreSQL versions are not
2424
recommended. You can remove the check from 'configure.in' but it is then
2525
your responsibility whether the result works or not.])])
26-
AC_COPYRIGHT([Copyright (c) 1996-2015, PostgreSQL Global Development Group])
26+
AC_COPYRIGHT([Copyright (c) 1996-2015, PostgreSQL Global Development Group
27+
Copyright (c) 2015-2016, Postgres Professional])
2728
AC_CONFIG_SRCDIR([src/backend/access/common/heaptuple.c])
2829
AC_CONFIG_AUX_DIR(config)
2930
AC_PREFIX_DEFAULT(/usr/local/pgsql)
@@ -699,6 +700,16 @@ PGAC_ARG_BOOL(with, selinux, no, [build with SELinux support])
699700
AC_SUBST(with_selinux)
700701
AC_MSG_RESULT([$with_selinux])
701702

703+
#
704+
# ICU
705+
#
706+
AC_MSG_CHECKING([whether to build with ICU support])
707+
PGAC_ARG_BOOL(with, icu, no, [ --with-icu build with ICU support],
708+
[AC_DEFINE([USE_ICU], 1, [Define to build with ICU support. (--with-icu)])])
709+
AC_MSG_RESULT([$with_icu])
710+
AC_SUBST(with_icu)
711+
712+
702713
#
703714
# Readline
704715
#
@@ -1036,6 +1047,75 @@ if test "$with_openssl" = yes ; then
10361047
AC_CHECK_FUNCS([SSL_get_current_compression])
10371048
fi
10381049

1050+
if test "$with_icu" = yes ; then
1051+
AC_SEARCH_LIBS(ucol_open_57, [icui18n icuin], [], [
1052+
AC_SEARCH_LIBS(ucol_open_56, [icui18n icuin], [], [
1053+
AC_SEARCH_LIBS(ucol_open_55, [icui18n icuin], [], [
1054+
AC_SEARCH_LIBS(ucol_open_54, [icui18n icuin], [], [
1055+
AC_SEARCH_LIBS(ucol_open_53, [icui18n icuin], [], [
1056+
AC_SEARCH_LIBS(ucol_open_52, [icui18n icuin], [], [
1057+
AC_SEARCH_LIBS(ucol_open_50, [icui18n icuin], [], [
1058+
AC_SEARCH_LIBS(ucol_open_48, [icui18n icuin], [], [
1059+
AC_SEARCH_LIBS(ucol_open_46, [icui18n icuin], [], [
1060+
AC_SEARCH_LIBS(ucol_open_44, [icui18n icuin], [], [
1061+
AC_SEARCH_LIBS(ucol_open_43, [icui18n icuin], [], [
1062+
AC_SEARCH_LIBS(ucol_open_4_2, [icui18n icuin], [], [
1063+
AC_SEARCH_LIBS(ucol_open_4_1, [icui18n icuin], [], [
1064+
AC_SEARCH_LIBS(ucol_open_4_0, [icui18n icuin], [], [
1065+
AC_SEARCH_LIBS(ucol_open_3_8, [icui18n icuin], [], [
1066+
AC_SEARCH_LIBS(ucol_open_3_6, [icui18n icuin], [], [
1067+
AC_SEARCH_LIBS(ucol_open_3_4, [icui18n icuin], [], [AC_MSG_ERROR([library 'icui18n' is required for ICU])])
1068+
])
1069+
])
1070+
])
1071+
])
1072+
])
1073+
])
1074+
])
1075+
])
1076+
])
1077+
])
1078+
])
1079+
])
1080+
])
1081+
])
1082+
])
1083+
])
1084+
AC_CHECK_LIB(icuuc, ucnv_fromUChars_57, [], [
1085+
AC_CHECK_LIB(icuuc, ucnv_fromUChars_56, [], [
1086+
AC_CHECK_LIB(icuuc, ucnv_fromUChars_55, [], [
1087+
AC_CHECK_LIB(icuuc, ucnv_fromUChars_54, [], [
1088+
AC_CHECK_LIB(icuuc, ucnv_fromUChars_53, [], [
1089+
AC_CHECK_LIB(icuuc, ucnv_fromUChars_52, [], [
1090+
AC_CHECK_LIB(icuuc, ucnv_fromUChars_50, [], [
1091+
AC_CHECK_LIB(icuuc, ucnv_fromUChars_48, [], [
1092+
AC_CHECK_LIB(icuuc, ucnv_fromUChars_46, [], [
1093+
AC_CHECK_LIB(icuuc, ucnv_fromUChars_44, [], [
1094+
AC_CHECK_LIB(icuuc, ucnv_fromUChars_43, [], [
1095+
AC_CHECK_LIB(icuuc, ucnv_fromUChars_4_2, [], [
1096+
AC_CHECK_LIB(icuuc, ucnv_fromUChars_4_1, [], [
1097+
AC_CHECK_LIB(icuuc, ucnv_fromUChars_4_0, [], [
1098+
AC_CHECK_LIB(icuuc, ucnv_fromUChars_3_8, [], [
1099+
AC_CHECK_LIB(icuuc, ucnv_fromUChars_3_6, [], [
1100+
AC_CHECK_LIB(icuuc, ucnv_fromUChars_3_4, [], [AC_MSG_ERROR([library 'icuuc' is required for ICU])])
1101+
])
1102+
])
1103+
])
1104+
])
1105+
])
1106+
])
1107+
])
1108+
])
1109+
])
1110+
])
1111+
])
1112+
])
1113+
])
1114+
])
1115+
])
1116+
])
1117+
fi
1118+
10391119
if test "$with_pam" = yes ; then
10401120
AC_CHECK_LIB(pam, pam_start, [], [AC_MSG_ERROR([library 'pam' is required for PAM])])
10411121
fi
@@ -1162,6 +1242,10 @@ if test "$with_openssl" = yes ; then
11621242
AC_CHECK_HEADER(openssl/err.h, [], [AC_MSG_ERROR([header file <openssl/err.h> is required for OpenSSL])])
11631243
fi
11641244

1245+
if test "$with_icu" = yes ; then
1246+
AC_CHECK_HEADER(unicode/utypes.h, [], [AC_MSG_ERROR([header file <unicode/utypes.h> is required for ICU])])
1247+
fi
1248+
11651249
if test "$with_pam" = yes ; then
11661250
AC_CHECK_HEADERS(security/pam_appl.h, [],
11671251
[AC_CHECK_HEADERS(pam/pam_appl.h, [],

‎contrib/Makefile

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,19 @@ SUBDIRS = \
1616
dblink\
1717
dict_int\
1818
dict_xsyn\
19+
dump_stat\
1920
earthdistance\
2021
file_fdw\
2122
fuzzystrmatch\
2223
hstore\
24+
hunspell_en_us\
25+
hunspell_fr\
26+
hunspell_nl_nl\
27+
hunspell_ru_ru\
2328
intagg\
2429
intarray\
2530
isn\
31+
jsquery\
2632
lo\
2733
ltree\
2834
oid2name\
@@ -39,7 +45,9 @@ SUBDIRS = \
3945
pgstattuple\
4046
postgres_fdw\
4147
seg\
48+
shared_ispell\
4249
spi\
50+
sr_plan\
4351
tablefunc\
4452
tcn\
4553
test_decoding\

‎contrib/dblink/dblink.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
*
1111
* contrib/dblink/dblink.c
1212
* Copyright (c) 2001-2015, PostgreSQL Global Development Group
13+
* Copyright (c) 2015-2016, Postgres Professional
1314
* ALL RIGHTS RESERVED;
1415
*
1516
* Permission to use, copy, modify, and distribute this software and its
@@ -2058,7 +2059,7 @@ get_pkey_attnames(Relation rel, int16 *numatts)
20582059
/* we're only interested if it is the primary key */
20592060
if (index->indisprimary)
20602061
{
2061-
*numatts=index->indnatts;
2062+
*numatts=index->indnkeyatts;
20622063
if (*numatts>0)
20632064
{
20642065
result= (char**)palloc(*numatts*sizeof(char*));

‎contrib/fuzzystrmatch/fuzzystrmatch.c

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -171,12 +171,12 @@ levenshtein_with_costs(PG_FUNCTION_ARGS)
171171
/* Extract a pointer to the actual character data */
172172
s_data=VARDATA_ANY(src);
173173
t_data=VARDATA_ANY(dst);
174-
/* Determine length of each string in bytesand characters*/
174+
/* Determine length of each string in bytes */
175175
s_bytes=VARSIZE_ANY_EXHDR(src);
176176
t_bytes=VARSIZE_ANY_EXHDR(dst);
177177

178-
PG_RETURN_INT32(varstr_levenshtein(s_data,s_bytes,t_data,t_bytes,ins_c,
179-
del_c,sub_c));
178+
PG_RETURN_INT32(varstr_levenshtein(s_data,s_bytes,t_data,t_bytes,
179+
ins_c,del_c,sub_c, false));
180180
}
181181

182182

@@ -194,12 +194,12 @@ levenshtein(PG_FUNCTION_ARGS)
194194
/* Extract a pointer to the actual character data */
195195
s_data=VARDATA_ANY(src);
196196
t_data=VARDATA_ANY(dst);
197-
/* Determine length of each string in bytesand characters*/
197+
/* Determine length of each string in bytes */
198198
s_bytes=VARSIZE_ANY_EXHDR(src);
199199
t_bytes=VARSIZE_ANY_EXHDR(dst);
200200

201-
PG_RETURN_INT32(varstr_levenshtein(s_data,s_bytes,t_data,t_bytes,1,1,
202-
1));
201+
PG_RETURN_INT32(varstr_levenshtein(s_data,s_bytes,t_data,t_bytes,
202+
1,1,1, false));
203203
}
204204

205205

@@ -221,13 +221,14 @@ levenshtein_less_equal_with_costs(PG_FUNCTION_ARGS)
221221
/* Extract a pointer to the actual character data */
222222
s_data=VARDATA_ANY(src);
223223
t_data=VARDATA_ANY(dst);
224-
/* Determine length of each string in bytesand characters*/
224+
/* Determine length of each string in bytes */
225225
s_bytes=VARSIZE_ANY_EXHDR(src);
226226
t_bytes=VARSIZE_ANY_EXHDR(dst);
227227

228-
PG_RETURN_INT32(varstr_levenshtein_less_equal(s_data,s_bytes,t_data,
229-
t_bytes,ins_c,del_c,
230-
sub_c,max_d));
228+
PG_RETURN_INT32(varstr_levenshtein_less_equal(s_data,s_bytes,
229+
t_data,t_bytes,
230+
ins_c,del_c,sub_c,
231+
max_d, false));
231232
}
232233

233234

@@ -246,12 +247,14 @@ levenshtein_less_equal(PG_FUNCTION_ARGS)
246247
/* Extract a pointer to the actual character data */
247248
s_data=VARDATA_ANY(src);
248249
t_data=VARDATA_ANY(dst);
249-
/* Determine length of each string in bytesand characters*/
250+
/* Determine length of each string in bytes */
250251
s_bytes=VARSIZE_ANY_EXHDR(src);
251252
t_bytes=VARSIZE_ANY_EXHDR(dst);
252253

253-
PG_RETURN_INT32(varstr_levenshtein_less_equal(s_data,s_bytes,t_data,
254-
t_bytes,1,1,1,max_d));
254+
PG_RETURN_INT32(varstr_levenshtein_less_equal(s_data,s_bytes,
255+
t_data,t_bytes,
256+
1,1,1,
257+
max_d, false));
255258
}
256259

257260

‎contrib/hstore/expected/hstore.out

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1466,10 +1466,10 @@ select cast( hstore '"a key" =>1, b => t, c => null, d=> 12345, e => 012345, f=
14661466
{"b": "t", "c": null, "d": "12345", "e": "012345", "f": "1.234", "g": "2.345e+4", "a key": "1"}
14671467
(1 row)
14681468

1469-
select hstore_to_json_loose('"a key" =>1, b => t, c => null, d=> 12345, e => 012345, f=> 1.234, g=> 2.345e+4');
1470-
hstore_to_json_loose
1471-
------------------------------------------------------------------------------------------
1472-
{"b": true, "c": null, "d": 12345, "e": "012345", "f": 1.234, "g": 2.345e+4, "a key": 1}
1469+
select hstore_to_json_loose('"a key" =>1, b => t, c => null, d=> 12345, e => 012345, f=> 1.234, g=> 2.345e+4, h=> "2016-01-01"');
1470+
hstore_to_json_loose
1471+
-------------------------------------------------------------------------------------------------------------
1472+
{"b": true, "c": null, "d": 12345, "e": "012345", "f": 1.234, "g": 2.345e+4, "h": "2016-01-01", "a key": 1}
14731473
(1 row)
14741474

14751475
select hstore_to_jsonb('"a key" =>1, b => t, c => null, d=> 12345, e => 012345, f=> 1.234, g=> 2.345e+4');
@@ -1484,10 +1484,10 @@ select cast( hstore '"a key" =>1, b => t, c => null, d=> 12345, e => 012345, f=
14841484
{"b": "t", "c": null, "d": "12345", "e": "012345", "f": "1.234", "g": "2.345e+4", "a key": "1"}
14851485
(1 row)
14861486

1487-
select hstore_to_jsonb_loose('"a key" =>1, b => t, c => null, d=> 12345, e => 012345, f=> 1.234, g=> 2.345e+4');
1488-
hstore_to_jsonb_loose
1489-
---------------------------------------------------------------------------------------
1490-
{"b": true, "c": null, "d": 12345, "e": "012345", "f": 1.234, "g": 23450, "a key": 1}
1487+
select hstore_to_jsonb_loose('"a key" =>1, b => t, c => null, d=> 12345, e => 012345, f=> 1.234, g=> 2.345e+4, h=> "2016-01-01"');
1488+
hstore_to_jsonb_loose
1489+
----------------------------------------------------------------------------------------------------------
1490+
{"b": true, "c": null, "d": 12345, "e": "012345", "f": 1.234, "g": 23450, "h": "2016-01-01", "a key": 1}
14911491
(1 row)
14921492

14931493
create table test_json_agg (f1 text, f2 hstore);

‎contrib/hstore/sql/hstore.sql

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -334,11 +334,11 @@ select count(*) from testhstore where h = 'pos=>98, line=>371, node=>CBA, indexe
334334
-- json and jsonb
335335
select hstore_to_json('"a key" =>1, b => t, c => null, d=> 12345, e => 012345, f=> 1.234, g=> 2.345e+4');
336336
select cast( hstore'"a key" =>1, b => t, c => null, d=> 12345, e => 012345, f=> 1.234, g=> 2.345e+4'as json);
337-
select hstore_to_json_loose('"a key" =>1, b => t, c => null, d=> 12345, e => 012345, f=> 1.234, g=> 2.345e+4');
337+
select hstore_to_json_loose('"a key" =>1, b => t, c => null, d=> 12345, e => 012345, f=> 1.234, g=> 2.345e+4, h=> "2016-01-01"');
338338

339339
select hstore_to_jsonb('"a key" =>1, b => t, c => null, d=> 12345, e => 012345, f=> 1.234, g=> 2.345e+4');
340340
select cast( hstore'"a key" =>1, b => t, c => null, d=> 12345, e => 012345, f=> 1.234, g=> 2.345e+4'as jsonb);
341-
select hstore_to_jsonb_loose('"a key" =>1, b => t, c => null, d=> 12345, e => 012345, f=> 1.234, g=> 2.345e+4');
341+
select hstore_to_jsonb_loose('"a key" =>1, b => t, c => null, d=> 12345, e => 012345, f=> 1.234, g=> 2.345e+4, h=> "2016-01-01"');
342342

343343
createtabletest_json_agg (f1text, f2 hstore);
344344
insert into test_json_aggvalues ('rec1','"a key" =>1, b => t, c => null, d=> 12345, e => 012345, f=> 1.234, g=> 2.345e+4'),

‎contrib/hstore_plperl/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ endif
3232
ifeq ($(PORTNAME), win32)
3333
# these settings are the same as for plperl
3434
overrideCPPFLAGS += -DPLPERL_HAVE_UID_GID -Wno-comment
35-
SHLIB_LINK += ../hstore/libhstore.a$(wildcard ../../src/pl/plperl/libperl*.a)
35+
SHLIB_LINK += ../hstore/libhstore.a$(sort$(wildcard ../../src/pl/plperl/libperl*.a))
3636
endif
3737

3838
ifeq ($(PORTNAME), cygwin)

‎contrib/hstore_plperl/hstore_plperl--1.0.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
-- make sure the prerequisite libraries are loaded
2-
DO'' LANGUAGEplperl;
2+
LOAD'plperl';
33
SELECTNULL::hstore;
44

55

‎contrib/hstore_plperl/hstore_plperlu--1.0.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
-- make sure the prerequisite libraries are loaded
2-
DO'' LANGUAGE plperlu;
2+
LOAD'plperl';
33
SELECTNULL::hstore;
44

55

‎contrib/hstore_plpython/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ endif
2727
# dependency. This does preclude pgxs builds.
2828
ifeq ($(PORTNAME), aix)
2929
rpathdir =$(pkglibdir):$(python_libdir)
30-
SHLIB_LINK += ../hstore/libhstore.exp$(python_libspec)$(python_additional_libs)$(wildcard ../../src/pl/plpython/libplpython*.exp)
30+
SHLIB_LINK += ../hstore/libhstore.exp$(python_libspec)$(python_additional_libs)$(sort$(wildcard ../../src/pl/plpython/libplpython*.exp))
3131
endif
3232
ifeq ($(PORTNAME), win32)
33-
SHLIB_LINK += ../hstore/libhstore.a$(wildcard ../../src/pl/plpython/libpython*.a)$(wildcard ../../src/pl/plpython/libplpython*.a)
33+
SHLIB_LINK += ../hstore/libhstore.a$(sort$(wildcard ../../src/pl/plpython/libpython*.a))$(sort$(wildcard ../../src/pl/plpython/libplpython*.a))
3434
endif
3535

3636
ifeq ($(PORTNAME), cygwin)

‎contrib/hstore_plpython/hstore_plpython2u--1.0.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
-- make sure the prerequisite libraries are loaded
2-
DO'1' LANGUAGE plpython2u;
2+
LOAD'plpython2';
33
SELECTNULL::hstore;
44

55

‎contrib/hstore_plpython/hstore_plpython3u--1.0.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
-- make sure the prerequisite libraries are loaded
2-
DO'1' LANGUAGE plpython3u;
2+
LOAD'plpython3';
33
SELECTNULL::hstore;
44

55

‎contrib/hstore_plpython/hstore_plpythonu--1.0.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
-- make sure the prerequisite libraries are loaded
2-
DO'1' LANGUAGE plpythonu;
2+
LOAD'plpython2';-- change to plpython3 if that ever becomes the default
33
SELECTNULL::hstore;
44

55

‎contrib/hunspell_en_us/Makefile

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
EXTENSION = hunspell_en_us
2+
DATA = sql/hunspell_en_us--1.0.sql
3+
4+
DATA_TSEARCH = dict/en_us.affix dict/en_us.dict
5+
6+
REGRESS = hunspell_en_us
7+
8+
ifdefUSE_PGXS
9+
PG_CONFIG = pg_config
10+
PGXS :=$(shell$(PG_CONFIG) --pgxs)
11+
include$(PGXS)
12+
else
13+
subdir = contrib/hunspell_en_us
14+
top_builddir = ../..
15+
include$(top_builddir)/src/Makefile.global
16+
include$(top_srcdir)/contrib/contrib-global.mk
17+
endif

0 commit comments

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