Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit b3399cb

Browse files
committed
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>
1 parent 1091402 commit b3399cb

File tree

4 files changed

+21
-21
lines changed

4 files changed

+21
-21
lines changed

src/test/regress/expected/brin.out

+1-1
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ INSERT INTO brinopers VALUES
149149
'{100, 100, 1, 100, 100}'),
150150
('textcol', 'text',
151151
'{>, >=, =, <=, <}',
152-
'{AAAAAA, AAAAAA, BNAAAABNAAAABNAAAABNAAAABNAAAABNAAAABNAAAABNAAAA, ZZAAAA, ZZAAAA}',
152+
'{ABABAB, ABABAB, BNAAAABNAAAABNAAAABNAAAABNAAAABNAAAABNAAAABNAAAA, ZZAAAA, ZZAAAA}',
153153
'{100, 100, 1, 100, 100}'),
154154
('oidcol', 'oid',
155155
'{>, >=, =, <=, <}',

src/test/regress/expected/rowsecurity.out

+17-17
Original file line numberDiff line numberDiff line change
@@ -664,7 +664,7 @@ EXPLAIN (COSTS OFF) SELECT a, b, oid FROM t2 UNION ALL SELECT a, b, oid FROM t3;
664664
RESET SESSION AUTHORIZATION;
665665
SET row_security TO OFF;
666666
SELECT * FROM t1 WHERE f_leak(b);
667-
NOTICE: f_leak => aaa
667+
NOTICE: f_leak => aba
668668
NOTICE: f_leak => bbb
669669
NOTICE: f_leak => ccc
670670
NOTICE: f_leak => ddd
@@ -677,7 +677,7 @@ NOTICE: f_leak => yyy
677677
NOTICE: f_leak => zzz
678678
a | b
679679
---+-----
680-
1 | aaa
680+
1 | aba
681681
2 | bbb
682682
3 | ccc
683683
4 | ddd
@@ -706,7 +706,7 @@ EXPLAIN (COSTS OFF) SELECT * FROM t1 WHERE f_leak(b);
706706
SET SESSION AUTHORIZATION regress_rls_exempt_user;
707707
SET row_security TO OFF;
708708
SELECT * FROM t1 WHERE f_leak(b);
709-
NOTICE: f_leak => aaa
709+
NOTICE: f_leak => aba
710710
NOTICE: f_leak => bbb
711711
NOTICE: f_leak => ccc
712712
NOTICE: f_leak => ddd
@@ -719,7 +719,7 @@ NOTICE: f_leak => yyy
719719
NOTICE: f_leak => zzz
720720
a | b
721721
---+-----
722-
1 | aaa
722+
1 | aba
723723
2 | bbb
724724
3 | ccc
725725
4 | ddd
@@ -952,7 +952,7 @@ EXPLAIN (COSTS OFF) EXECUTE p1(2);
952952
RESET SESSION AUTHORIZATION;
953953
SET row_security TO OFF;
954954
SELECT * FROM t1 WHERE f_leak(b);
955-
NOTICE: f_leak => aaa
955+
NOTICE: f_leak => aba
956956
NOTICE: f_leak => bbb
957957
NOTICE: f_leak => ccc
958958
NOTICE: f_leak => ddd
@@ -965,7 +965,7 @@ NOTICE: f_leak => yyy
965965
NOTICE: f_leak => zzz
966966
a | b
967967
---+-----
968-
1 | aaa
968+
1 | aba
969969
2 | bbb
970970
3 | ccc
971971
4 | ddd
@@ -994,7 +994,7 @@ EXPLAIN (COSTS OFF) SELECT * FROM t1 WHERE f_leak(b);
994994
EXECUTE p1(2);
995995
a | b
996996
---+-----
997-
1 | aaa
997+
1 | aba
998998
2 | bbb
999999
1 | abc
10001000
2 | bcd
@@ -1345,7 +1345,7 @@ SET row_security TO OFF;
13451345
SELECT * FROM t1 ORDER BY a,b;
13461346
a | b
13471347
---+-------------
1348-
1 | aaa
1348+
1 | aba
13491349
1 | abc
13501350
1 | xxx
13511351
2 | bbbbbb_updt
@@ -1653,7 +1653,7 @@ CREATE TABLE z2 (a int, b text);
16531653
GRANT SELECT ON z1,z2 TO regress_rls_group1, regress_rls_group2,
16541654
regress_rls_bob, regress_rls_carol;
16551655
INSERT INTO z1 VALUES
1656-
(1, 'aaa'),
1656+
(1, 'aba'),
16571657
(2, 'bbb'),
16581658
(3, 'ccc'),
16591659
(4, 'ddd');
@@ -1777,11 +1777,11 @@ EXPLAIN (COSTS OFF) EXECUTE plancache_test3;
17771777

17781778
SET SESSION AUTHORIZATION regress_rls_carol;
17791779
SELECT * FROM z1 WHERE f_leak(b);
1780-
NOTICE: f_leak => aaa
1780+
NOTICE: f_leak => aba
17811781
NOTICE: f_leak => ccc
17821782
a | b
17831783
---+-----
1784-
1 | aaa
1784+
1 | aba
17851785
3 | ccc
17861786
(2 rows)
17871787

@@ -1833,11 +1833,11 @@ EXPLAIN (COSTS OFF) EXECUTE plancache_test3;
18331833

18341834
SET ROLE regress_rls_group2;
18351835
SELECT * FROM z1 WHERE f_leak(b);
1836-
NOTICE: f_leak => aaa
1836+
NOTICE: f_leak => aba
18371837
NOTICE: f_leak => ccc
18381838
a | b
18391839
---+-----
1840-
1 | aaa
1840+
1 | aba
18411841
3 | ccc
18421842
(2 rows)
18431843

@@ -1897,13 +1897,13 @@ GRANT SELECT ON rls_view TO regress_rls_bob;
18971897
-- Query as role that is not owner of view or table. Should return all records.
18981898
SET SESSION AUTHORIZATION regress_rls_bob;
18991899
SELECT * FROM rls_view;
1900-
NOTICE: f_leak => aaa
1900+
NOTICE: f_leak => aba
19011901
NOTICE: f_leak => bbb
19021902
NOTICE: f_leak => ccc
19031903
NOTICE: f_leak => ddd
19041904
a | b
19051905
---+-----
1906-
1 | aaa
1906+
1 | aba
19071907
2 | bbb
19081908
3 | ccc
19091909
4 | ddd
@@ -1919,13 +1919,13 @@ EXPLAIN (COSTS OFF) SELECT * FROM rls_view;
19191919
-- Query as view/table owner. Should return all records.
19201920
SET SESSION AUTHORIZATION regress_rls_alice;
19211921
SELECT * FROM rls_view;
1922-
NOTICE: f_leak => aaa
1922+
NOTICE: f_leak => aba
19231923
NOTICE: f_leak => bbb
19241924
NOTICE: f_leak => ccc
19251925
NOTICE: f_leak => ddd
19261926
a | b
19271927
---+-----
1928-
1 | aaa
1928+
1 | aba
19291929
2 | bbb
19301930
3 | ccc
19311931
4 | ddd

src/test/regress/sql/brin.sql

+1-1
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ INSERT INTO brinopers VALUES
154154
'{100, 100, 1, 100, 100}'),
155155
('textcol', 'text',
156156
'{>, >=, =, <=, <}',
157-
'{AAAAAA, AAAAAA, BNAAAABNAAAABNAAAABNAAAABNAAAABNAAAABNAAAABNAAAA, ZZAAAA, ZZAAAA}',
157+
'{ABABAB, ABABAB, BNAAAABNAAAABNAAAABNAAAABNAAAABNAAAABNAAAABNAAAA, ZZAAAA, ZZAAAA}',
158158
'{100, 100, 1, 100, 100}'),
159159
('oidcol', 'oid',
160160
'{>, >=, =, <=, <}',

src/test/regress/sql/rowsecurity.sql

+2-2
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ ALTER TABLE t1 DROP COLUMN junk1; -- just a disturbing factor
200200
GRANT ALL ON t1 TO public;
201201

202202
COPY t1 FROM stdin WITH (oids);
203-
101 1 aaa
203+
101 1 aba
204204
102 2 bbb
205205
103 3 ccc
206206
104 4 ddd
@@ -635,7 +635,7 @@ GRANT SELECT ON z1,z2 TO regress_rls_group1, regress_rls_group2,
635635
regress_rls_bob, regress_rls_carol;
636636

637637
INSERT INTO z1 VALUES
638-
(1, 'aaa'),
638+
(1, 'aba'),
639639
(2, 'bbb'),
640640
(3, 'ccc'),
641641
(4, 'ddd');

0 commit comments

Comments
 (0)