Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit2aa2533

Browse files
committed
Fix regression tests to work in Welsh locale.
Welsh (cy_GB) apparently sorts 'dd' after 'f', creating problemsanalogous to the odd sorting of 'aa' in Danish. Adjust regressiontest case to not use data that provokes that.Jeff JanesPatch: <CAMkU=1zx-pqcfSApL2pYDQurPOCfcYU0wJorsmY1OrYPiXRbLw@mail.gmail.com>
1 parentd365dc3 commit2aa2533

File tree

2 files changed

+46
-46
lines changed

2 files changed

+46
-46
lines changed

‎src/test/regress/expected/rowsecurity.out

Lines changed: 44 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -488,7 +488,7 @@ SELECT * FROM t1;
488488
a | b
489489
---+-----
490490
2 | bbb
491-
4 |ddd
491+
4 |dad
492492
2 | bcd
493493
4 | def
494494
2 | yyy
@@ -508,14 +508,14 @@ EXPLAIN (COSTS OFF) SELECT * FROM t1;
508508

509509
SELECT * FROM t1 WHERE f_leak(b);
510510
NOTICE: f_leak => bbb
511-
NOTICE: f_leak =>ddd
511+
NOTICE: f_leak =>dad
512512
NOTICE: f_leak => bcd
513513
NOTICE: f_leak => def
514514
NOTICE: f_leak => yyy
515515
a | b
516516
---+-----
517517
2 | bbb
518-
4 |ddd
518+
4 |dad
519519
2 | bcd
520520
4 | def
521521
2 | yyy
@@ -540,7 +540,7 @@ SELECT oid, * FROM t1;
540540
oid | a | b
541541
-----+---+-----
542542
102 | 2 | bbb
543-
104 | 4 |ddd
543+
104 | 4 |dad
544544
202 | 2 | bcd
545545
204 | 4 | def
546546
302 | 2 | yyy
@@ -563,7 +563,7 @@ SELECT *, t1 FROM t1;
563563
a | b | t1
564564
---+-----+---------
565565
2 | bbb | (2,bbb)
566-
4 |ddd | (4,ddd)
566+
4 |dad | (4,dad)
567567
2 | bcd | (2,bcd)
568568
4 | def | (4,def)
569569
2 | yyy | (2,yyy)
@@ -586,7 +586,7 @@ SELECT * FROM t1 FOR SHARE;
586586
a | b
587587
---+-----
588588
2 | bbb
589-
4 |ddd
589+
4 |dad
590590
2 | bcd
591591
4 | def
592592
2 | yyy
@@ -610,14 +610,14 @@ EXPLAIN (COSTS OFF) SELECT * FROM t1 FOR SHARE;
610610

611611
SELECT * FROM t1 WHERE f_leak(b) FOR SHARE;
612612
NOTICE: f_leak => bbb
613-
NOTICE: f_leak =>ddd
613+
NOTICE: f_leak =>dad
614614
NOTICE: f_leak => bcd
615615
NOTICE: f_leak => def
616616
NOTICE: f_leak => yyy
617617
a | b
618618
---+-----
619619
2 | bbb
620-
4 |ddd
620+
4 |dad
621621
2 | bcd
622622
4 | def
623623
2 | yyy
@@ -667,7 +667,7 @@ SELECT * FROM t1 WHERE f_leak(b);
667667
NOTICE: f_leak => aba
668668
NOTICE: f_leak => bbb
669669
NOTICE: f_leak => ccc
670-
NOTICE: f_leak =>ddd
670+
NOTICE: f_leak =>dad
671671
NOTICE: f_leak => abc
672672
NOTICE: f_leak => bcd
673673
NOTICE: f_leak => cde
@@ -680,7 +680,7 @@ NOTICE: f_leak => zzz
680680
1 | aba
681681
2 | bbb
682682
3 | ccc
683-
4 |ddd
683+
4 |dad
684684
1 | abc
685685
2 | bcd
686686
3 | cde
@@ -709,7 +709,7 @@ SELECT * FROM t1 WHERE f_leak(b);
709709
NOTICE: f_leak => aba
710710
NOTICE: f_leak => bbb
711711
NOTICE: f_leak => ccc
712-
NOTICE: f_leak =>ddd
712+
NOTICE: f_leak =>dad
713713
NOTICE: f_leak => abc
714714
NOTICE: f_leak => bcd
715715
NOTICE: f_leak => cde
@@ -722,7 +722,7 @@ NOTICE: f_leak => zzz
722722
1 | aba
723723
2 | bbb
724724
3 | ccc
725-
4 |ddd
725+
4 |dad
726726
1 | abc
727727
2 | bcd
728728
3 | cde
@@ -955,7 +955,7 @@ SELECT * FROM t1 WHERE f_leak(b);
955955
NOTICE: f_leak => aba
956956
NOTICE: f_leak => bbb
957957
NOTICE: f_leak => ccc
958-
NOTICE: f_leak =>ddd
958+
NOTICE: f_leak =>dad
959959
NOTICE: f_leak => abc
960960
NOTICE: f_leak => bcd
961961
NOTICE: f_leak => cde
@@ -968,7 +968,7 @@ NOTICE: f_leak => zzz
968968
1 | aba
969969
2 | bbb
970970
3 | ccc
971-
4 |ddd
971+
4 |dad
972972
1 | abc
973973
2 | bcd
974974
3 | cde
@@ -1088,7 +1088,7 @@ EXPLAIN (COSTS OFF) UPDATE t1 SET b = b || b WHERE f_leak(b);
10881088

10891089
UPDATE t1 SET b = b || b WHERE f_leak(b);
10901090
NOTICE: f_leak => bbb
1091-
NOTICE: f_leak =>ddd
1091+
NOTICE: f_leak =>dad
10921092
NOTICE: f_leak => bcd
10931093
NOTICE: f_leak => def
10941094
NOTICE: f_leak => yyy
@@ -1105,42 +1105,42 @@ EXPLAIN (COSTS OFF) UPDATE only t1 SET b = b || '_updt' WHERE f_leak(b);
11051105

11061106
UPDATE only t1 SET b = b || '_updt' WHERE f_leak(b);
11071107
NOTICE: f_leak => bbbbbb
1108-
NOTICE: f_leak =>dddddd
1108+
NOTICE: f_leak =>daddad
11091109
-- returning clause with system column
11101110
UPDATE only t1 SET b = b WHERE f_leak(b) RETURNING oid, *, t1;
11111111
NOTICE: f_leak => bbbbbb_updt
1112-
NOTICE: f_leak =>dddddd_updt
1112+
NOTICE: f_leak =>daddad_updt
11131113
oid | a | b | t1
11141114
-----+---+-------------+-----------------
11151115
102 | 2 | bbbbbb_updt | (2,bbbbbb_updt)
1116-
104 | 4 |dddddd_updt | (4,dddddd_updt)
1116+
104 | 4 |daddad_updt | (4,daddad_updt)
11171117
(2 rows)
11181118

11191119
UPDATE t1 SET b = b WHERE f_leak(b) RETURNING *;
11201120
NOTICE: f_leak => bbbbbb_updt
1121-
NOTICE: f_leak =>dddddd_updt
1121+
NOTICE: f_leak =>daddad_updt
11221122
NOTICE: f_leak => bcdbcd
11231123
NOTICE: f_leak => defdef
11241124
NOTICE: f_leak => yyyyyy
11251125
a | b
11261126
---+-------------
11271127
2 | bbbbbb_updt
1128-
4 |dddddd_updt
1128+
4 |daddad_updt
11291129
2 | bcdbcd
11301130
4 | defdef
11311131
2 | yyyyyy
11321132
(5 rows)
11331133

11341134
UPDATE t1 SET b = b WHERE f_leak(b) RETURNING oid, *, t1;
11351135
NOTICE: f_leak => bbbbbb_updt
1136-
NOTICE: f_leak =>dddddd_updt
1136+
NOTICE: f_leak =>daddad_updt
11371137
NOTICE: f_leak => bcdbcd
11381138
NOTICE: f_leak => defdef
11391139
NOTICE: f_leak => yyyyyy
11401140
oid | a | b | t1
11411141
-----+---+-------------+-----------------
11421142
102 | 2 | bbbbbb_updt | (2,bbbbbb_updt)
1143-
104 | 4 |dddddd_updt | (4,dddddd_updt)
1143+
104 | 4 |daddad_updt | (4,daddad_updt)
11441144
202 | 2 | bcdbcd | (2,bcdbcd)
11451145
204 | 4 | defdef | (4,defdef)
11461146
302 | 2 | yyyyyy | (2,yyyyyy)
@@ -1328,15 +1328,15 @@ AND f_leak(t1_1.b) AND f_leak(t1_2.b) RETURNING *, t1_1, t1_2;
13281328
UPDATE t1 t1_1 SET b = t1_2.b FROM t1 t1_2
13291329
WHERE t1_1.a = 4 AND t1_2.a = t1_1.a AND t1_2.b = t1_1.b
13301330
AND f_leak(t1_1.b) AND f_leak(t1_2.b) RETURNING *, t1_1, t1_2;
1331-
NOTICE: f_leak =>dddddd_updt
1332-
NOTICE: f_leak =>dddddd_updt
1331+
NOTICE: f_leak =>daddad_updt
1332+
NOTICE: f_leak =>daddad_updt
13331333
NOTICE: f_leak => defdef
13341334
NOTICE: f_leak => defdef
1335-
NOTICE: f_leak =>dddddd_updt
1335+
NOTICE: f_leak =>daddad_updt
13361336
NOTICE: f_leak => defdef
13371337
a | b | a | b | t1_1 | t1_2
13381338
---+-------------+---+-------------+-----------------+-----------------
1339-
4 |dddddd_updt | 4 |dddddd_updt | (4,dddddd_updt) | (4,dddddd_updt)
1339+
4 |daddad_updt | 4 |daddad_updt | (4,daddad_updt) | (4,daddad_updt)
13401340
4 | defdef | 4 | defdef | (4,defdef) | (4,defdef)
13411341
(2 rows)
13421342

@@ -1354,7 +1354,7 @@ SELECT * FROM t1 ORDER BY a,b;
13541354
3 | ccc
13551355
3 | cde
13561356
3 | zzz
1357-
4 |dddddd_updt
1357+
4 |daddad_updt
13581358
4 | defdef
13591359
(11 rows)
13601360

@@ -1397,11 +1397,11 @@ EXPLAIN (COSTS OFF) DELETE FROM t1 WHERE f_leak(b);
13971397

13981398
DELETE FROM only t1 WHERE f_leak(b) RETURNING oid, *, t1;
13991399
NOTICE: f_leak => bbbbbb_updt
1400-
NOTICE: f_leak =>dddddd_updt
1400+
NOTICE: f_leak =>daddad_updt
14011401
oid | a | b | t1
14021402
-----+---+-------------+-----------------
14031403
102 | 2 | bbbbbb_updt | (2,bbbbbb_updt)
1404-
104 | 4 |dddddd_updt | (4,dddddd_updt)
1404+
104 | 4 |daddad_updt | (4,daddad_updt)
14051405
(2 rows)
14061406

14071407
DELETE FROM t1 WHERE f_leak(b) RETURNING oid, *, t1;
@@ -1656,18 +1656,18 @@ INSERT INTO z1 VALUES
16561656
(1, 'aba'),
16571657
(2, 'bbb'),
16581658
(3, 'ccc'),
1659-
(4, 'ddd');
1659+
(4, 'dad');
16601660
CREATE POLICY p1 ON z1 TO rls_regress_group1 USING (a % 2 = 0);
16611661
CREATE POLICY p2 ON z1 TO rls_regress_group2 USING (a % 2 = 1);
16621662
ALTER TABLE z1 ENABLE ROW LEVEL SECURITY;
16631663
SET SESSION AUTHORIZATION rls_regress_user1;
16641664
SELECT * FROM z1 WHERE f_leak(b);
16651665
NOTICE: f_leak => bbb
1666-
NOTICE: f_leak =>ddd
1666+
NOTICE: f_leak =>dad
16671667
a | b
16681668
---+-----
16691669
2 | bbb
1670-
4 |ddd
1670+
4 |dad
16711671
(2 rows)
16721672

16731673
EXPLAIN (COSTS OFF) SELECT * FROM z1 WHERE f_leak(b);
@@ -1722,11 +1722,11 @@ EXPLAIN (COSTS OFF) EXECUTE plancache_test3;
17221722
SET ROLE rls_regress_group1;
17231723
SELECT * FROM z1 WHERE f_leak(b);
17241724
NOTICE: f_leak => bbb
1725-
NOTICE: f_leak =>ddd
1725+
NOTICE: f_leak =>dad
17261726
a | b
17271727
---+-----
17281728
2 | bbb
1729-
4 |ddd
1729+
4 |dad
17301730
(2 rows)
17311731

17321732
EXPLAIN (COSTS OFF) SELECT * FROM z1 WHERE f_leak(b);
@@ -1900,13 +1900,13 @@ SELECT * FROM rls_view;
19001900
NOTICE: f_leak => aba
19011901
NOTICE: f_leak => bbb
19021902
NOTICE: f_leak => ccc
1903-
NOTICE: f_leak =>ddd
1903+
NOTICE: f_leak =>dad
19041904
a | b
19051905
---+-----
19061906
1 | aba
19071907
2 | bbb
19081908
3 | ccc
1909-
4 |ddd
1909+
4 |dad
19101910
(4 rows)
19111911

19121912
EXPLAIN (COSTS OFF) SELECT * FROM rls_view;
@@ -1922,13 +1922,13 @@ SELECT * FROM rls_view;
19221922
NOTICE: f_leak => aba
19231923
NOTICE: f_leak => bbb
19241924
NOTICE: f_leak => ccc
1925-
NOTICE: f_leak =>ddd
1925+
NOTICE: f_leak =>dad
19261926
a | b
19271927
---+-----
19281928
1 | aba
19291929
2 | bbb
19301930
3 | ccc
1931-
4 |ddd
1931+
4 |dad
19321932
(4 rows)
19331933

19341934
EXPLAIN (COSTS OFF) SELECT * FROM rls_view;
@@ -1948,11 +1948,11 @@ GRANT SELECT ON rls_view TO rls_regress_user0;
19481948
SET SESSION AUTHORIZATION rls_regress_user0;
19491949
SELECT * FROM rls_view;
19501950
NOTICE: f_leak => bbb
1951-
NOTICE: f_leak =>ddd
1951+
NOTICE: f_leak =>dad
19521952
a | b
19531953
---+-----
19541954
2 | bbb
1955-
4 |ddd
1955+
4 |dad
19561956
(2 rows)
19571957

19581958
EXPLAIN (COSTS OFF) SELECT * FROM rls_view;
@@ -1969,11 +1969,11 @@ EXPLAIN (COSTS OFF) SELECT * FROM rls_view;
19691969
SET SESSION AUTHORIZATION rls_regress_user1;
19701970
SELECT * FROM rls_view;
19711971
NOTICE: f_leak => bbb
1972-
NOTICE: f_leak =>ddd
1972+
NOTICE: f_leak =>dad
19731973
a | b
19741974
---+-----
19751975
2 | bbb
1976-
4 |ddd
1976+
4 |dad
19771977
(2 rows)
19781978

19791979
EXPLAIN (COSTS OFF) SELECT * FROM rls_view;
@@ -1996,11 +1996,11 @@ SET SESSION AUTHORIZATION rls_regress_user1;
19961996
GRANT SELECT ON rls_view TO rls_regress_user2;
19971997
SELECT * FROM rls_view;
19981998
NOTICE: f_leak => bbb
1999-
NOTICE: f_leak =>ddd
1999+
NOTICE: f_leak =>dad
20002000
a | b
20012001
---+-----
20022002
2 | bbb
2003-
4 |ddd
2003+
4 |dad
20042004
(2 rows)
20052005

20062006
EXPLAIN (COSTS OFF) SELECT * FROM rls_view;

‎src/test/regress/sql/rowsecurity.sql

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ COPY t1 FROM stdin WITH (oids);
203203
1011aba
204204
1022bbb
205205
1033ccc
206-
1044ddd
206+
1044dad
207207
\.
208208

209209
CREATETABLEt2 (c float) INHERITS (t1);
@@ -638,7 +638,7 @@ INSERT INTO z1 VALUES
638638
(1,'aba'),
639639
(2,'bbb'),
640640
(3,'ccc'),
641-
(4,'ddd');
641+
(4,'dad');
642642

643643
CREATE POLICY p1ON z1 TO rls_regress_group1 USING (a %2=0);
644644
CREATE POLICY p2ON z1 TO rls_regress_group2 USING (a %2=1);

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp