Skip to content

Commit 86e501c

Browse files
stalkergstalkerg
committed
Merge branch 'PGPRO9_5' into PGPRO9_5_ptrack
2 parents 878f1cc + 3e485fe commit 86e501c

File tree

176 files changed

+5767
-2697
lines changed

Some content is hidden

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

176 files changed

+5767
-2697
lines changed

‎GNUmakefile.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ distdir:
109109
$(MAKE) -C $(distdir)/doc/src/sgml/ INSTALL
110110
cp $(distdir)/doc/src/sgml/INSTALL $(distdir)/
111111
$(MAKE) -C $(distdir) distclean
112-
$(MAKE) -C $(distdir)/contrib/pg_arman/doc pg_arman.1 XMLTO=/usr/bin/xmlto ASCIIDOC=/usr/bin/asciidoc
112+
cd $(distdir)/contrib/pg_arman/doc; $(PANDOC) -o pg_arman.1 -t man -s pg_arman.md
113113
rm -f $(distdir)/README.git
114114

115115
distcheck: dist

‎configure

Lines changed: 43 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -631,6 +631,7 @@ PGPRO_VERSION
631631
vpath_build
632632
PG_VERSION_NUM
633633
PROVE
634+
PANDOC
634635
OSX
635636
XSLTPROC
636637
XMLLINT
@@ -2745,7 +2746,7 @@ fi
27452746

27462747

27472748

2748-
PGPRO_VERSION="$PACKAGE_VERSION.2"
2749+
PGPRO_VERSION="$PACKAGE_VERSION.3"
27492750
PGPRO_PACKAGE_NAME="PostgresPro"
27502751

27512752

@@ -17257,6 +17258,47 @@ fi
1725717258
test -n "$OSX" && break
1725817259
done
1725917260

17261+
for ac_prog in pandoc
17262+
do
17263+
# Extract the first word of "$ac_prog", so it can be a program name with args.
17264+
set dummy $ac_prog; ac_word=$2
17265+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
17266+
$as_echo_n "checking for $ac_word... " >&6; }
17267+
if ${ac_cv_prog_PANDOC+:} false; then :
17268+
$as_echo_n "(cached) " >&6
17269+
else
17270+
if test -n "$PANDOC"; then
17271+
ac_cv_prog_PANDOC="$PANDOC" # Let the user override the test.
17272+
else
17273+
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
17274+
for as_dir in $PATH
17275+
do
17276+
IFS=$as_save_IFS
17277+
test -z "$as_dir" && as_dir=.
17278+
for ac_exec_ext in '' $ac_executable_extensions; do
17279+
if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
17280+
ac_cv_prog_PANDOC="$ac_prog"
17281+
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
17282+
break 2
17283+
fi
17284+
done
17285+
done
17286+
IFS=$as_save_IFS
17287+
17288+
fi
17289+
fi
17290+
PANDOC=$ac_cv_prog_PANDOC
17291+
if test -n "$PANDOC"; then
17292+
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $PANDOC" >&5
17293+
$as_echo "$PANDOC" >&6; }
17294+
else
17295+
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
17296+
$as_echo "no" >&6; }
17297+
fi
17298+
17299+
17300+
test -n "$PANDOC" && break
17301+
done
1726017302

1726117303
#
1726217304
# Check for test tools

‎configure.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ PGAC_ARG_REQ(with, extra-version, [STRING], [append STRING to version],
3838
[PG_VERSION="$PACKAGE_VERSION$withval"],
3939
[PG_VERSION="$PACKAGE_VERSION"])
4040

41-
PGPRO_VERSION="$PACKAGE_VERSION.2"
41+
PGPRO_VERSION="$PACKAGE_VERSION.3"
4242
PGPRO_PACKAGE_NAME="PostgresPro"
4343
AC_SUBST(PGPRO_PACKAGE_NAME)
4444

@@ -2134,7 +2134,7 @@ AC_CHECK_PROGS(DBTOEPUB, dbtoepub)
21342134
AC_CHECK_PROGS(XMLLINT, xmllint)
21352135
AC_CHECK_PROGS(XSLTPROC, xsltproc)
21362136
AC_CHECK_PROGS(OSX, [osx sgml2xml sx])
2137-
2137+
AC_CHECK_PROGS(PANDOC, pandoc)
21382138
#
21392139
# Check for test tools
21402140
#

‎contrib/btree_gist/expected/interval.out

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,3 +89,21 @@ SELECT a, a <-> '199 days 21:21:23' FROM intervaltmp ORDER BY a <-> '199 days 21
8989
@ 220 days 19 hours 5 mins 42 secs | @ 21 days -2 hours -15 mins -41 secs
9090
(3 rows)
9191

92+
SET enable_indexonlyscan=off;
93+
EXPLAIN (COSTS OFF)
94+
SELECT a, a <-> '199 days 21:21:23' FROM intervaltmp ORDER BY a <-> '199 days 21:21:23' LIMIT 3;
95+
QUERY PLAN
96+
---------------------------------------------------------------------------
97+
Limit
98+
-> Index Scan using intervalidx on intervaltmp
99+
Order By: (a <-> '@ 199 days 21 hours 21 mins 23 secs'::interval)
100+
(3 rows)
101+
102+
SELECT a, a <-> '199 days 21:21:23' FROM intervaltmp ORDER BY a <-> '199 days 21:21:23' LIMIT 3;
103+
a | ?column?
104+
-------------------------------------+--------------------------------------
105+
@ 199 days 21 hours 21 mins 23 secs | @ 0
106+
@ 183 days 6 hours 52 mins 48 secs | @ 16 days 14 hours 28 mins 35 secs
107+
@ 220 days 19 hours 5 mins 42 secs | @ 21 days -2 hours -15 mins -41 secs
108+
(3 rows)
109+

‎contrib/btree_gist/sql/interval.sql

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,3 +35,9 @@ SELECT count(*) FROM intervaltmp WHERE a > '199 days 21:21:23'::interval;
3535
EXPLAIN (COSTS OFF)
3636
SELECT a, a <-> '199 days 21:21:23' FROM intervaltmp ORDER BY a <-> '199 days 21:21:23' LIMIT 3;
3737
SELECT a, a <-> '199 days 21:21:23' FROM intervaltmp ORDER BY a <-> '199 days 21:21:23' LIMIT 3;
38+
39+
SET enable_indexonlyscan=off;
40+
41+
EXPLAIN (COSTS OFF)
42+
SELECT a, a <-> '199 days 21:21:23' FROM intervaltmp ORDER BY a <-> '199 days 21:21:23' LIMIT 3;
43+
SELECT a, a <-> '199 days 21:21:23' FROM intervaltmp ORDER BY a <-> '199 days 21:21:23' LIMIT 3;

‎contrib/hunspell_en_us/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
EXTENSION = hunspell_en_us
2-
DATA = sql/hunspell_en_us--1.0.sql
2+
DATA = hunspell_en_us--1.0.sql
33

4-
DATA_TSEARCH = dict/en_us.affix dict/en_us.dict
4+
DATA_TSEARCH = en_us.affix en_us.dict
55

66
REGRESS = hunspell_en_us
77

‎contrib/hunspell_en_us/dict/en_us.affix renamed to ‎contrib/hunspell_en_us/en_us.affix

File renamed without changes.

‎contrib/hunspell_en_us/dict/en_us.dict renamed to ‎contrib/hunspell_en_us/en_us.dict

File renamed without changes.

‎contrib/hunspell_en_us/expected/hunspell_en_us.out

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ CREATE EXTENSION hunspell_en_us;
22
CREATE TABLE table1(name varchar);
33
INSERT INTO table1 VALUES ('leaves'), ('leaved'), ('leaving'),
44
('inability'), ('abilities'), ('disability'), ('ability');
5-
SELECT d.* FROM table1 AS t, LATERAL ts_debug('public.english', t.name) AS d;
5+
SELECT d.* FROM table1 AS t, LATERAL ts_debug('english_hunspell', t.name) AS d;
66
alias | description | token | dictionaries | dictionary | lexemes
77
-----------+-----------------+------------+---------------------------------+------------------+-----------
88
asciiword | Word, all ASCII | leaves | {english_hunspell,english_stem} | english_hunspell | {leave}
@@ -14,18 +14,18 @@ SELECT d.* FROM table1 AS t, LATERAL ts_debug('public.english', t.name) AS d;
1414
asciiword | Word, all ASCII | ability | {english_hunspell,english_stem} | english_hunspell | {ability}
1515
(7 rows)
1616

17-
CREATE INDEX name_idx ON table1 USING GIN (to_tsvector('public.english', "name"));
18-
SELECT * FROM table1 WHERE to_tsvector('public.english', name)
19-
@@ to_tsquery('public.english', 'leaving');
17+
CREATE INDEX name_idx ON table1 USING GIN (to_tsvector('english_hunspell', "name"));
18+
SELECT * FROM table1 WHERE to_tsvector('english_hunspell', name)
19+
@@ to_tsquery('english_hunspell', 'leaving');
2020
name
2121
---------
2222
leaves
2323
leaved
2424
leaving
2525
(3 rows)
2626

27-
SELECT * FROM table1 WHERE to_tsvector('public.english', name)
28-
@@ to_tsquery('public.english', 'abilities');
27+
SELECT * FROM table1 WHERE to_tsvector('english_hunspell', name)
28+
@@ to_tsquery('english_hunspell', 'abilities');
2929
name
3030
------------
3131
inability
@@ -34,8 +34,8 @@ SELECT * FROM table1 WHERE to_tsvector('public.english', name)
3434
ability
3535
(4 rows)
3636

37-
SELECT * FROM table1 WHERE to_tsvector('public.english', name)
38-
@@ to_tsquery('public.english', 'ability');
37+
SELECT * FROM table1 WHERE to_tsvector('english_hunspell', name)
38+
@@ to_tsquery('english_hunspell', 'ability');
3939
name
4040
------------
4141
inability
@@ -45,18 +45,18 @@ SELECT * FROM table1 WHERE to_tsvector('public.english', name)
4545
(4 rows)
4646

4747
DROP INDEX name_idx;
48-
CREATE INDEX name_idx ON table1 USING GIST (to_tsvector('public.english', "name"));
49-
SELECT * FROM table1 WHERE to_tsvector('public.english', name)
50-
@@ to_tsquery('public.english', 'leaving');
48+
CREATE INDEX name_idx ON table1 USING GIST (to_tsvector('english_hunspell', "name"));
49+
SELECT * FROM table1 WHERE to_tsvector('english_hunspell', name)
50+
@@ to_tsquery('english_hunspell', 'leaving');
5151
name
5252
---------
5353
leaves
5454
leaved
5555
leaving
5656
(3 rows)
5757

58-
SELECT * FROM table1 WHERE to_tsvector('public.english', name)
59-
@@ to_tsquery('public.english', 'abilities');
58+
SELECT * FROM table1 WHERE to_tsvector('english_hunspell', name)
59+
@@ to_tsquery('english_hunspell', 'abilities');
6060
name
6161
------------
6262
inability
@@ -65,8 +65,8 @@ SELECT * FROM table1 WHERE to_tsvector('public.english', name)
6565
ability
6666
(4 rows)
6767

68-
SELECT * FROM table1 WHERE to_tsvector('public.english', name)
69-
@@ to_tsquery('public.english', 'ability');
68+
SELECT * FROM table1 WHERE to_tsvector('english_hunspell', name)
69+
@@ to_tsquery('english_hunspell', 'ability');
7070
name
7171
------------
7272
inability

‎contrib/hunspell_en_us/hunspell_en_us--1.0.sql

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
/* contrib/hunspell_en_us/hunspell_en_us--1.0.sql */
2+
3+
-- complain if script is sourced in psql, rather than via CREATE EXTENSION
4+
\echo Use "CREATE EXTENSION hunspell_en_us" to load this file. \quit
5+
6+
CREATE TEXT SEARCH DICTIONARY english_hunspell (
7+
TEMPLATE = ispell,
8+
DictFile = en_us,
9+
AffFile = en_us,
10+
StopWords = english
11+
);
12+
13+
COMMENT ON TEXT SEARCH DICTIONARY english_hunspell IS 'hunspell dictionary for english language';
14+
15+
CREATE TEXT SEARCH CONFIGURATION english_hunspell (
16+
COPY = simple
17+
);
18+
19+
COMMENT ON TEXT SEARCH CONFIGURATION english_hunspell IS 'hunspell configuration for english language';
20+
21+
ALTER TEXT SEARCH CONFIGURATION english_hunspell
22+
ALTER MAPPING FOR asciiword, asciihword, hword_asciipart,
23+
word, hword, hword_part
24+
WITH english_hunspell, english_stem;

0 commit comments

Comments
 (0)