Skip to content

Commit d024357

Browse files
dmpgprodmpgpro
committed
Merge branch 'master' into PGPRO9_6
2 parents ba74654 + be7f7ee commit d024357

File tree

180 files changed

+5609
-6305
lines changed

Some content is hidden

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

180 files changed

+5609
-6305
lines changed

‎contrib/btree_gin/expected/bytea.out

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,21 @@ SET bytea_output TO escape;
44
CREATE TABLE test_bytea (
55
i bytea
66
);
7-
INSERT INTO test_bytea VALUES ('aaa'),('a'),('abc'),('abb'),('axy'),('xyz');
7+
INSERT INTO test_bytea VALUES ('a'),('ab'),('abc'),('abb'),('axy'),('xyz');
88
CREATE INDEX idx_bytea ON test_bytea USING gin (i);
99
SELECT * FROM test_bytea WHERE i<'abc'::bytea ORDER BY i;
1010
i
1111
-----
1212
a
13-
aaa
13+
ab
1414
abb
1515
(3 rows)
1616

1717
SELECT * FROM test_bytea WHERE i<='abc'::bytea ORDER BY i;
1818
i
1919
-----
2020
a
21-
aaa
21+
ab
2222
abb
2323
abc
2424
(4 rows)

‎contrib/btree_gin/expected/text.out

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,21 @@ set enable_seqscan=off;
22
CREATE TABLE test_text (
33
i text
44
);
5-
INSERT INTO test_text VALUES ('aaa'),('a'),('abc'),('abb'),('axy'),('xyz');
5+
INSERT INTO test_text VALUES ('a'),('ab'),('abc'),('abb'),('axy'),('xyz');
66
CREATE INDEX idx_text ON test_text USING gin (i);
77
SELECT * FROM test_text WHERE i<'abc' ORDER BY i;
88
i
99
-----
1010
a
11-
aaa
11+
ab
1212
abb
1313
(3 rows)
1414

1515
SELECT * FROM test_text WHERE i<='abc' ORDER BY i;
1616
i
1717
-----
1818
a
19-
aaa
19+
ab
2020
abb
2121
abc
2222
(4 rows)

‎contrib/btree_gin/expected/varchar.out

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,21 @@ set enable_seqscan=off;
22
CREATE TABLE test_varchar (
33
i varchar
44
);
5-
INSERT INTO test_varchar VALUES ('aaa'),('a'),('abc'),('abb'),('axy'),('xyz');
5+
INSERT INTO test_varchar VALUES ('a'),('ab'),('abc'),('abb'),('axy'),('xyz');
66
CREATE INDEX idx_varchar ON test_varchar USING gin (i);
77
SELECT * FROM test_varchar WHERE i<'abc'::varchar ORDER BY i;
88
i
99
-----
1010
a
11-
aaa
11+
ab
1212
abb
1313
(3 rows)
1414

1515
SELECT * FROM test_varchar WHERE i<='abc'::varchar ORDER BY i;
1616
i
1717
-----
1818
a
19-
aaa
19+
ab
2020
abb
2121
abc
2222
(4 rows)

‎contrib/btree_gin/sql/bytea.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ CREATE TABLE test_bytea (
66
i bytea
77
);
88

9-
INSERT INTO test_bytea VALUES ('aaa'),('a'),('abc'),('abb'),('axy'),('xyz');
9+
INSERT INTO test_bytea VALUES ('a'),('ab'),('abc'),('abb'),('axy'),('xyz');
1010

1111
CREATE INDEX idx_bytea ON test_bytea USING gin (i);
1212

‎contrib/btree_gin/sql/text.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ CREATE TABLE test_text (
44
i text
55
);
66

7-
INSERT INTO test_text VALUES ('aaa'),('a'),('abc'),('abb'),('axy'),('xyz');
7+
INSERT INTO test_text VALUES ('a'),('ab'),('abc'),('abb'),('axy'),('xyz');
88

99
CREATE INDEX idx_text ON test_text USING gin (i);
1010

‎contrib/btree_gin/sql/varchar.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ CREATE TABLE test_varchar (
44
i varchar
55
);
66

7-
INSERT INTO test_varchar VALUES ('aaa'),('a'),('abc'),('abb'),('axy'),('xyz');
7+
INSERT INTO test_varchar VALUES ('a'),('ab'),('abc'),('abb'),('axy'),('xyz');
88

99
CREATE INDEX idx_varchar ON test_varchar USING gin (i);
1010

‎contrib/citext/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
MODULES = citext
44

55
EXTENSION = citext
6-
DATA = citext--1.2.sql citext--1.1--1.2.sql citext--1.0--1.1.sql \
7-
citext--unpackaged--1.0.sql
6+
DATA = citext--1.3.sql citext--1.2--1.3.sql citext--1.1--1.2.sql \
7+
citext--1.0--1.1.sql citext--unpackaged--1.0.sql
88
PGFILEDESC = "citext - case-insensitive character string data type"
99

1010
REGRESS = citext

‎contrib/citext/citext--1.2--1.3.sql

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
/* contrib/citext/citext--1.2--1.3.sql */
2+
3+
-- complain if script is sourced in psql, rather than via ALTER EXTENSION
4+
\echo Use "ALTER EXTENSION citext UPDATE TO '1.3'" to load this file. \quit
5+
6+
UPDATE pg_aggregate SET aggcombinefn = 'citext_smaller'
7+
WHERE aggfnoid = 'min(citext)'::pg_catalog.regprocedure;

‎contrib/citext/citext--1.2.sql renamed to ‎contrib/citext/citext--1.3.sql

File renamed without changes.

‎contrib/citext/citext.control

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# citext extension
22
comment = 'data type for case-insensitive character strings'
3-
default_version = '1.2'
3+
default_version = '1.3'
44
module_pathname = '$libdir/citext'
55
relocatable = true

0 commit comments

Comments
 (0)