git.postgresql.org Git - postgresql.git/commitdiff

git projects / postgresql.git / commitdiff

Make core regression tests safe for Danish locale.

2016年7月21日 17:11:00 +0000 (13:11 -0400)

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>

src/test/regress/expected/brin.out patch | blob | blame | history

src/test/regress/expected/rowsecurity.out patch | blob | blame | history

src/test/regress/sql/brin.sql patch | blob | blame | history

src/test/regress/sql/rowsecurity.sql patch | blob | blame | history

diff --git a/src/test/regress/expected/brin.out b/src/test/regress/expected/brin.out

index 475525912fe7ba4b8d0093fe4a3c57ecc4932523..21676e53a0df4c83d8bd43bf21bf38701dde86bf 100644 (file)

--- a/src/test/regress/expected/brin.out

+++ b/src/test/regress/expected/brin.out

@@ -149,7 +149,7 @@ INSERT INTO brinopers VALUES

'{100, 100, 1, 100, 100}'),

('textcol', 'text',

'{>, >=, =, <=, <}',

- '{AAAAAA, AAAAAA, BNAAAABNAAAABNAAAABNAAAABNAAAABNAAAABNAAAABNAAAA, ZZAAAA, ZZAAAA}',

+ '{ABABAB, ABABAB, BNAAAABNAAAABNAAAABNAAAABNAAAABNAAAABNAAAABNAAAA, ZZAAAA, ZZAAAA}',

'{100, 100, 1, 100, 100}'),

('oidcol', 'oid',

'{>, >=, =, <=, <}',

diff --git a/src/test/regress/expected/rowsecurity.out b/src/test/regress/expected/rowsecurity.out

index 35541cefa0be8d42f72e3ec943db33dfd83a91e7..14495efa67b2d3e2957ecb60fa1a13a11a719e9e 100644 (file)

--- a/src/test/regress/expected/rowsecurity.out

+++ b/src/test/regress/expected/rowsecurity.out

@@ -664,7 +664,7 @@ EXPLAIN (COSTS OFF) SELECT a, b, oid FROM t2 UNION ALL SELECT a, b, oid FROM t3;

RESET SESSION AUTHORIZATION;

SET row_security TO OFF;

SELECT * FROM t1 WHERE f_leak(b);

-NOTICE: f_leak => aaa

+NOTICE: f_leak => aba

NOTICE: f_leak => bbb

NOTICE: f_leak => ccc

NOTICE: f_leak => ddd

@@ -677,7 +677,7 @@ NOTICE: f_leak => yyy

NOTICE: f_leak => zzz

a | b

---+-----

- 1 | aaa

+ 1 | aba

2 | bbb

3 | ccc

4 | ddd

@@ -706,7 +706,7 @@ EXPLAIN (COSTS OFF) SELECT * FROM t1 WHERE f_leak(b);

SET SESSION AUTHORIZATION regress_rls_exempt_user;

SET row_security TO OFF;

SELECT * FROM t1 WHERE f_leak(b);

-NOTICE: f_leak => aaa

+NOTICE: f_leak => aba

NOTICE: f_leak => bbb

NOTICE: f_leak => ccc

NOTICE: f_leak => ddd

@@ -719,7 +719,7 @@ NOTICE: f_leak => yyy

NOTICE: f_leak => zzz

a | b

---+-----

- 1 | aaa

+ 1 | aba

2 | bbb

3 | ccc

4 | ddd

@@ -952,7 +952,7 @@ EXPLAIN (COSTS OFF) EXECUTE p1(2);

RESET SESSION AUTHORIZATION;

SET row_security TO OFF;

SELECT * FROM t1 WHERE f_leak(b);

-NOTICE: f_leak => aaa

+NOTICE: f_leak => aba

NOTICE: f_leak => bbb

NOTICE: f_leak => ccc

NOTICE: f_leak => ddd

@@ -965,7 +965,7 @@ NOTICE: f_leak => yyy

NOTICE: f_leak => zzz

a | b

---+-----

- 1 | aaa

+ 1 | aba

2 | bbb

3 | ccc

4 | ddd

@@ -994,7 +994,7 @@ EXPLAIN (COSTS OFF) SELECT * FROM t1 WHERE f_leak(b);

EXECUTE p1(2);

a | b

---+-----

- 1 | aaa

+ 1 | aba

2 | bbb

1 | abc

2 | bcd

@@ -1345,7 +1345,7 @@ SET row_security TO OFF;

SELECT * FROM t1 ORDER BY a,b;

a | b

---+-------------

- 1 | aaa

+ 1 | aba

1 | abc

1 | xxx

2 | bbbbbb_updt

@@ -1653,7 +1653,7 @@ CREATE TABLE z2 (a int, b text);

GRANT SELECT ON z1,z2 TO regress_rls_group1, regress_rls_group2,

regress_rls_bob, regress_rls_carol;

INSERT INTO z1 VALUES

- (1, 'aaa'),

+ (1, 'aba'),

(2, 'bbb'),

(3, 'ccc'),

(4, 'ddd');

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

SET SESSION AUTHORIZATION regress_rls_carol;

SELECT * FROM z1 WHERE f_leak(b);

-NOTICE: f_leak => aaa

+NOTICE: f_leak => aba

NOTICE: f_leak => ccc

a | b

---+-----

- 1 | aaa

+ 1 | aba

3 | ccc

(2 rows)

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

SET ROLE regress_rls_group2;

SELECT * FROM z1 WHERE f_leak(b);

-NOTICE: f_leak => aaa

+NOTICE: f_leak => aba

NOTICE: f_leak => ccc

a | b

---+-----

- 1 | aaa

+ 1 | aba

3 | ccc

(2 rows)

@@ -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.

SET SESSION AUTHORIZATION regress_rls_bob;

SELECT * FROM rls_view;

-NOTICE: f_leak => aaa

+NOTICE: f_leak => aba

NOTICE: f_leak => bbb

NOTICE: f_leak => ccc

NOTICE: f_leak => ddd

a | b

---+-----

- 1 | aaa

+ 1 | aba

2 | bbb

3 | ccc

4 | ddd

@@ -1919,13 +1919,13 @@ EXPLAIN (COSTS OFF) SELECT * FROM rls_view;

-- Query as view/table owner. Should return all records.

SET SESSION AUTHORIZATION regress_rls_alice;

SELECT * FROM rls_view;

-NOTICE: f_leak => aaa

+NOTICE: f_leak => aba

NOTICE: f_leak => bbb

NOTICE: f_leak => ccc

NOTICE: f_leak => ddd

a | b

---+-----

- 1 | aaa

+ 1 | aba

2 | bbb

3 | ccc

4 | ddd

diff --git a/src/test/regress/sql/brin.sql b/src/test/regress/sql/brin.sql

index 9e4836e17ebec32f7a8be29f692091a0751856e1..e7f6f779010b78808d2b24ea311c7c8e4298a16c 100644 (file)

--- a/src/test/regress/sql/brin.sql

+++ b/src/test/regress/sql/brin.sql

@@ -154,7 +154,7 @@ INSERT INTO brinopers VALUES

'{100, 100, 1, 100, 100}'),

('textcol', 'text',

'{>, >=, =, <=, <}',

- '{AAAAAA, AAAAAA, BNAAAABNAAAABNAAAABNAAAABNAAAABNAAAABNAAAABNAAAA, ZZAAAA, ZZAAAA}',

+ '{ABABAB, ABABAB, BNAAAABNAAAABNAAAABNAAAABNAAAABNAAAABNAAAABNAAAA, ZZAAAA, ZZAAAA}',

'{100, 100, 1, 100, 100}'),

('oidcol', 'oid',

'{>, >=, =, <=, <}',

diff --git a/src/test/regress/sql/rowsecurity.sql b/src/test/regress/sql/rowsecurity.sql

index a142923cdcf0ba370e9fe178e69c06d60d8ebb42..785ac84746ed2742396674959987350cb14debeb 100644 (file)

--- a/src/test/regress/sql/rowsecurity.sql

+++ b/src/test/regress/sql/rowsecurity.sql

@@ -200,7 +200,7 @@ ALTER TABLE t1 DROP COLUMN junk1; -- just a disturbing factor

GRANT ALL ON t1 TO public;

COPY t1 FROM stdin WITH (oids);

-101 1 aaa

+101 1 aba

102 2 bbb

103 3 ccc

104 4 ddd

@@ -635,7 +635,7 @@ GRANT SELECT ON z1,z2 TO regress_rls_group1, regress_rls_group2,

regress_rls_bob, regress_rls_carol;

INSERT INTO z1 VALUES

- (1, 'aaa'),

+ (1, 'aba'),

(2, 'bbb'),

(3, 'ccc'),

(4, 'ddd');

This is the main PostgreSQL git repository.

RSS Atom