Commit b3399cb0 authored by Tom Lane's avatar Tom Lane

Make core regression tests safe for Danish locale.

Some tests added in 9.5 depended on 'aa' sorting before 'bb', which
doesn't hold true in Danish.  Use slightly different test data to
avoid the problem.

Jeff Janes

Report: <CAMkU=1w-cEDbA+XHdNb=YS_4wvZbs66Ni9KeSJKAJGNJyOsgQw@mail.gmail.com>
parent 1091402b
...@@ -149,7 +149,7 @@ INSERT INTO brinopers VALUES ...@@ -149,7 +149,7 @@ INSERT INTO brinopers VALUES
'{100, 100, 1, 100, 100}'), '{100, 100, 1, 100, 100}'),
('textcol', 'text', ('textcol', 'text',
'{>, >=, =, <=, <}', '{>, >=, =, <=, <}',
'{AAAAAA, AAAAAA, BNAAAABNAAAABNAAAABNAAAABNAAAABNAAAABNAAAABNAAAA, ZZAAAA, ZZAAAA}', '{ABABAB, ABABAB, BNAAAABNAAAABNAAAABNAAAABNAAAABNAAAABNAAAABNAAAA, ZZAAAA, ZZAAAA}',
'{100, 100, 1, 100, 100}'), '{100, 100, 1, 100, 100}'),
('oidcol', 'oid', ('oidcol', 'oid',
'{>, >=, =, <=, <}', '{>, >=, =, <=, <}',
......
...@@ -664,7 +664,7 @@ EXPLAIN (COSTS OFF) SELECT a, b, oid FROM t2 UNION ALL SELECT a, b, oid FROM t3; ...@@ -664,7 +664,7 @@ EXPLAIN (COSTS OFF) SELECT a, b, oid FROM t2 UNION ALL SELECT a, b, oid FROM t3;
RESET SESSION AUTHORIZATION; RESET SESSION AUTHORIZATION;
SET row_security TO OFF; SET row_security TO OFF;
SELECT * FROM t1 WHERE f_leak(b); SELECT * FROM t1 WHERE f_leak(b);
NOTICE: f_leak => aaa NOTICE: f_leak => aba
NOTICE: f_leak => bbb NOTICE: f_leak => bbb
NOTICE: f_leak => ccc NOTICE: f_leak => ccc
NOTICE: f_leak => ddd NOTICE: f_leak => ddd
...@@ -677,7 +677,7 @@ NOTICE: f_leak => yyy ...@@ -677,7 +677,7 @@ NOTICE: f_leak => yyy
NOTICE: f_leak => zzz NOTICE: f_leak => zzz
a | b a | b
---+----- ---+-----
1 | aaa 1 | aba
2 | bbb 2 | bbb
3 | ccc 3 | ccc
4 | ddd 4 | ddd
...@@ -706,7 +706,7 @@ EXPLAIN (COSTS OFF) SELECT * FROM t1 WHERE f_leak(b); ...@@ -706,7 +706,7 @@ EXPLAIN (COSTS OFF) SELECT * FROM t1 WHERE f_leak(b);
SET SESSION AUTHORIZATION regress_rls_exempt_user; SET SESSION AUTHORIZATION regress_rls_exempt_user;
SET row_security TO OFF; SET row_security TO OFF;
SELECT * FROM t1 WHERE f_leak(b); SELECT * FROM t1 WHERE f_leak(b);
NOTICE: f_leak => aaa NOTICE: f_leak => aba
NOTICE: f_leak => bbb NOTICE: f_leak => bbb
NOTICE: f_leak => ccc NOTICE: f_leak => ccc
NOTICE: f_leak => ddd NOTICE: f_leak => ddd
...@@ -719,7 +719,7 @@ NOTICE: f_leak => yyy ...@@ -719,7 +719,7 @@ NOTICE: f_leak => yyy
NOTICE: f_leak => zzz NOTICE: f_leak => zzz
a | b a | b
---+----- ---+-----
1 | aaa 1 | aba
2 | bbb 2 | bbb
3 | ccc 3 | ccc
4 | ddd 4 | ddd
...@@ -952,7 +952,7 @@ EXPLAIN (COSTS OFF) EXECUTE p1(2); ...@@ -952,7 +952,7 @@ EXPLAIN (COSTS OFF) EXECUTE p1(2);
RESET SESSION AUTHORIZATION; RESET SESSION AUTHORIZATION;
SET row_security TO OFF; SET row_security TO OFF;
SELECT * FROM t1 WHERE f_leak(b); SELECT * FROM t1 WHERE f_leak(b);
NOTICE: f_leak => aaa NOTICE: f_leak => aba
NOTICE: f_leak => bbb NOTICE: f_leak => bbb
NOTICE: f_leak => ccc NOTICE: f_leak => ccc
NOTICE: f_leak => ddd NOTICE: f_leak => ddd
...@@ -965,7 +965,7 @@ NOTICE: f_leak => yyy ...@@ -965,7 +965,7 @@ NOTICE: f_leak => yyy
NOTICE: f_leak => zzz NOTICE: f_leak => zzz
a | b a | b
---+----- ---+-----
1 | aaa 1 | aba
2 | bbb 2 | bbb
3 | ccc 3 | ccc
4 | ddd 4 | ddd
...@@ -994,7 +994,7 @@ EXPLAIN (COSTS OFF) SELECT * FROM t1 WHERE f_leak(b); ...@@ -994,7 +994,7 @@ EXPLAIN (COSTS OFF) SELECT * FROM t1 WHERE f_leak(b);
EXECUTE p1(2); EXECUTE p1(2);
a | b a | b
---+----- ---+-----
1 | aaa 1 | aba
2 | bbb 2 | bbb
1 | abc 1 | abc
2 | bcd 2 | bcd
...@@ -1345,7 +1345,7 @@ SET row_security TO OFF; ...@@ -1345,7 +1345,7 @@ SET row_security TO OFF;
SELECT * FROM t1 ORDER BY a,b; SELECT * FROM t1 ORDER BY a,b;
a | b a | b
---+------------- ---+-------------
1 | aaa 1 | aba
1 | abc 1 | abc
1 | xxx 1 | xxx
2 | bbbbbb_updt 2 | bbbbbb_updt
...@@ -1653,7 +1653,7 @@ CREATE TABLE z2 (a int, b text); ...@@ -1653,7 +1653,7 @@ CREATE TABLE z2 (a int, b text);
GRANT SELECT ON z1,z2 TO regress_rls_group1, regress_rls_group2, GRANT SELECT ON z1,z2 TO regress_rls_group1, regress_rls_group2,
regress_rls_bob, regress_rls_carol; regress_rls_bob, regress_rls_carol;
INSERT INTO z1 VALUES INSERT INTO z1 VALUES
(1, 'aaa'), (1, 'aba'),
(2, 'bbb'), (2, 'bbb'),
(3, 'ccc'), (3, 'ccc'),
(4, 'ddd'); (4, 'ddd');
...@@ -1777,11 +1777,11 @@ EXPLAIN (COSTS OFF) EXECUTE plancache_test3; ...@@ -1777,11 +1777,11 @@ EXPLAIN (COSTS OFF) EXECUTE plancache_test3;
SET SESSION AUTHORIZATION regress_rls_carol; SET SESSION AUTHORIZATION regress_rls_carol;
SELECT * FROM z1 WHERE f_leak(b); SELECT * FROM z1 WHERE f_leak(b);
NOTICE: f_leak => aaa NOTICE: f_leak => aba
NOTICE: f_leak => ccc NOTICE: f_leak => ccc
a | b a | b
---+----- ---+-----
1 | aaa 1 | aba
3 | ccc 3 | ccc
(2 rows) (2 rows)
...@@ -1833,11 +1833,11 @@ EXPLAIN (COSTS OFF) EXECUTE plancache_test3; ...@@ -1833,11 +1833,11 @@ EXPLAIN (COSTS OFF) EXECUTE plancache_test3;
SET ROLE regress_rls_group2; SET ROLE regress_rls_group2;
SELECT * FROM z1 WHERE f_leak(b); SELECT * FROM z1 WHERE f_leak(b);
NOTICE: f_leak => aaa NOTICE: f_leak => aba
NOTICE: f_leak => ccc NOTICE: f_leak => ccc
a | b a | b
---+----- ---+-----
1 | aaa 1 | aba
3 | ccc 3 | ccc
(2 rows) (2 rows)
...@@ -1897,13 +1897,13 @@ GRANT SELECT ON rls_view TO regress_rls_bob; ...@@ -1897,13 +1897,13 @@ GRANT SELECT ON rls_view TO regress_rls_bob;
-- Query as role that is not owner of view or table. Should return all records. -- Query as role that is not owner of view or table. Should return all records.
SET SESSION AUTHORIZATION regress_rls_bob; SET SESSION AUTHORIZATION regress_rls_bob;
SELECT * FROM rls_view; SELECT * FROM rls_view;
NOTICE: f_leak => aaa NOTICE: f_leak => aba
NOTICE: f_leak => bbb NOTICE: f_leak => bbb
NOTICE: f_leak => ccc NOTICE: f_leak => ccc
NOTICE: f_leak => ddd NOTICE: f_leak => ddd
a | b a | b
---+----- ---+-----
1 | aaa 1 | aba
2 | bbb 2 | bbb
3 | ccc 3 | ccc
4 | ddd 4 | ddd
...@@ -1919,13 +1919,13 @@ EXPLAIN (COSTS OFF) SELECT * FROM rls_view; ...@@ -1919,13 +1919,13 @@ EXPLAIN (COSTS OFF) SELECT * FROM rls_view;
-- Query as view/table owner. Should return all records. -- Query as view/table owner. Should return all records.
SET SESSION AUTHORIZATION regress_rls_alice; SET SESSION AUTHORIZATION regress_rls_alice;
SELECT * FROM rls_view; SELECT * FROM rls_view;
NOTICE: f_leak => aaa NOTICE: f_leak => aba
NOTICE: f_leak => bbb NOTICE: f_leak => bbb
NOTICE: f_leak => ccc NOTICE: f_leak => ccc
NOTICE: f_leak => ddd NOTICE: f_leak => ddd
a | b a | b
---+----- ---+-----
1 | aaa 1 | aba
2 | bbb 2 | bbb
3 | ccc 3 | ccc
4 | ddd 4 | ddd
......
...@@ -154,7 +154,7 @@ INSERT INTO brinopers VALUES ...@@ -154,7 +154,7 @@ INSERT INTO brinopers VALUES
'{100, 100, 1, 100, 100}'), '{100, 100, 1, 100, 100}'),
('textcol', 'text', ('textcol', 'text',
'{>, >=, =, <=, <}', '{>, >=, =, <=, <}',
'{AAAAAA, AAAAAA, BNAAAABNAAAABNAAAABNAAAABNAAAABNAAAABNAAAABNAAAA, ZZAAAA, ZZAAAA}', '{ABABAB, ABABAB, BNAAAABNAAAABNAAAABNAAAABNAAAABNAAAABNAAAABNAAAA, ZZAAAA, ZZAAAA}',
'{100, 100, 1, 100, 100}'), '{100, 100, 1, 100, 100}'),
('oidcol', 'oid', ('oidcol', 'oid',
'{>, >=, =, <=, <}', '{>, >=, =, <=, <}',
......
...@@ -200,7 +200,7 @@ ALTER TABLE t1 DROP COLUMN junk1; -- just a disturbing factor ...@@ -200,7 +200,7 @@ ALTER TABLE t1 DROP COLUMN junk1; -- just a disturbing factor
GRANT ALL ON t1 TO public; GRANT ALL ON t1 TO public;
COPY t1 FROM stdin WITH (oids); COPY t1 FROM stdin WITH (oids);
101 1 aaa 101 1 aba
102 2 bbb 102 2 bbb
103 3 ccc 103 3 ccc
104 4 ddd 104 4 ddd
...@@ -635,7 +635,7 @@ GRANT SELECT ON z1,z2 TO regress_rls_group1, regress_rls_group2, ...@@ -635,7 +635,7 @@ GRANT SELECT ON z1,z2 TO regress_rls_group1, regress_rls_group2,
regress_rls_bob, regress_rls_carol; regress_rls_bob, regress_rls_carol;
INSERT INTO z1 VALUES INSERT INTO z1 VALUES
(1, 'aaa'), (1, 'aba'),
(2, 'bbb'), (2, 'bbb'),
(3, 'ccc'), (3, 'ccc'),
(4, 'ddd'); (4, 'ddd');
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment