Skip to content

Commit d70d119

Browse files
committed
Make contrib regression tests safe for Danish locale.
In btree_gin and citext, avoid some not-particularly-interesting dependencies on the sorting of 'aa'. In tsearch2, use COLLATE "C" to remove an uninteresting dependency on locale sort order (and thereby allow removal of a variant expected-file). Also, in citext, avoid assuming that lower('I') = 'i'. This isn't relevant to Danish but it does fail in Turkish.
1 parent 95810ed commit d70d119

File tree

12 files changed

+271
-3311
lines changed

12 files changed

+271
-3311
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

0 commit comments

Comments
 (0)