NotificationsYou must be signed in to change notification settings
Fork5
Star26

Commit81d815d

committed

Suppress DROP CASCADE notices in regression tests

In the regression tests, when doing cascaded drops, we need to suppressthe notices from DROP CASCADE or there can be transient regressionfailures as the order of drops can depend on the physical row order inpg_depend.Report and fix suggestion from Tom.

1 parent30bf468 commit81d815dCopy full SHA for 81d815d

File tree

2 files changed

+23

-31

lines changed

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

2 files changed

+23

-31

lines changed

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

Lines changed: 9 additions & 31 deletions

Original file line number	Diff line number	Diff line change
`@@ -774,10 +774,10 @@ ERROR: infinite recursion detected in row-security policy for relation "rec1"`
`774`	`774`	`-- Mutual recursion via .s.b views`
`775`	`775`	`--`
`776`	`776`	`SET SESSION AUTHORIZATION rls_regress_user1;`
	`777`	`+-- Suppress NOTICE messages when doing a cascaded drop.`
	`778`	`+SET client_min_messages TO 'warning';`
`777`	`779`	`DROP VIEW rec1v, rec2v CASCADE;`
`778`		`-NOTICE: drop cascades to 2 other objects`
`779`		`-DETAIL: drop cascades to policy r1 on table rec1`
`780`		`-drop cascades to policy r2 on table rec2`
	`780`	`+RESET client_min_messages;`
`781`	`781`	`CREATE VIEW rec1v WITH (security_barrier) AS SELECT * FROM rec1;`
`782`	`782`	`CREATE VIEW rec2v WITH (security_barrier) AS SELECT * FROM rec2;`
`783`	`783`	`SET SESSION AUTHORIZATION rls_regress_user0;`
`@@ -1606,10 +1606,10 @@ EXPLAIN (COSTS OFF) SELECT * FROM y2 WHERE f_leak(b);`
`1606`	`1606`	`-- Plancache invalidate on user change.`
`1607`	`1607`	`--`
`1608`	`1608`	`RESET SESSION AUTHORIZATION;`
	`1609`	`+-- Suppress NOTICE messages when doing a cascaded drop.`
	`1610`	`+SET client_min_messages TO 'warning';`
`1609`	`1611`	`DROP TABLE t1 CASCADE;`
`1610`		`-NOTICE: drop cascades to 2 other objects`
`1611`		`-DETAIL: drop cascades to table t2`
`1612`		`-drop cascades to table t3`
	`1612`	`+RESET client_min_messages;`
`1613`	`1613`	`CREATE TABLE t1 (a integer);`
`1614`	`1614`	`GRANT SELECT ON t1 TO rls_regress_user1, rls_regress_user2;`
`1615`	`1615`	`CREATE POLICY p1 ON t1 TO rls_regress_user1 USING ((a % 2) = 0);`
`@@ -2205,32 +2205,10 @@ DROP TABLE copy_t;`
`2205`	`2205`	`-- Clean up objects`
`2206`	`2206`	`--`
`2207`	`2207`	`RESET SESSION AUTHORIZATION;`
	`2208`	`+-- Suppress NOTICE messages when doing a cascaded drop.`
	`2209`	`+SET client_min_messages TO 'warning';`
`2208`	`2210`	`DROP SCHEMA rls_regress_schema CASCADE;`
`2209`		`-NOTICE: drop cascades to 24 other objects`
`2210`		`-DETAIL: drop cascades to function f_leak(text)`
`2211`		`-drop cascades to table uaccount`
`2212`		`-drop cascades to table category`
`2213`		`-drop cascades to table document`
`2214`		`-drop cascades to table dependent`
`2215`		`-drop cascades to table rec1`
`2216`		`-drop cascades to table rec2`
`2217`		`-drop cascades to view rec1v`
`2218`		`-drop cascades to view rec2v`
`2219`		`-drop cascades to table s1`
`2220`		`-drop cascades to table s2`
`2221`		`-drop cascades to view v2`
`2222`		`-drop cascades to table z1`
`2223`		`-drop cascades to table x1`
`2224`		`-drop cascades to table y1`
`2225`		`-drop cascades to table y2`
`2226`		`-drop cascades to table t1`
`2227`		`-drop cascades to table t2`
`2228`		`-drop cascades to table t3`
`2229`		`-drop cascades to table t4`
`2230`		`-drop cascades to table event_trigger_test`
`2231`		`-drop cascades to function start_command()`
`2232`		`-drop cascades to function end_command()`
`2233`		`-drop cascades to function drop_sql_command()`
	`2211`	`+RESET client_min_messages;`
`2234`	`2212`	`DROP USER rls_regress_user0;`
`2235`	`2213`	`DROP USER rls_regress_user1;`
`2236`	`2214`	`DROP USER rls_regress_user2;`

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

Lines changed: 14 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -321,7 +321,12 @@ SELECT * FROM rec1; -- fail, mutual recursion via views`
`321`	`321`	`-- Mutual recursion via .s.b views`
`322`	`322`	`--`
`323`	`323`	`SET SESSION AUTHORIZATION rls_regress_user1;`
	`324`	`+-- Suppress NOTICE messages when doing a cascaded drop.`
	`325`	`+SET client_min_messages TO'warning';`
	`326`	`+`
`324`	`327`	`DROPVIEW rec1v, rec2v CASCADE;`
	`328`	`+RESET client_min_messages;`
	`329`	`+`
`325`	`330`	`CREATEVIEWrec1v WITH (security_barrier)ASSELECT*FROM rec1;`
`326`	`331`	`CREATEVIEWrec2v WITH (security_barrier)ASSELECT*FROM rec2;`
`327`	`332`	`SET SESSION AUTHORIZATION rls_regress_user0;`
`@@ -601,7 +606,12 @@ EXPLAIN (COSTS OFF) SELECT * FROM y2 WHERE f_leak(b);`
`601`	`606`	`-- Plancache invalidate on user change.`
`602`	`607`	`--`
`603`	`608`	`RESET SESSION AUTHORIZATION;`
	`609`	`+-- Suppress NOTICE messages when doing a cascaded drop.`
	`610`	`+SET client_min_messages TO'warning';`
	`611`	`+`
`604`	`612`	`DROPTABLE t1 CASCADE;`
	`613`	`+RESET client_min_messages;`
	`614`	`+`
`605`	`615`	`CREATETABLEt1 (ainteger);`
`606`	`616`
`607`	`617`	`GRANTSELECTON t1 TO rls_regress_user1, rls_regress_user2;`
`@@ -914,7 +924,11 @@ DROP TABLE copy_t;`
`914`	`924`	`--`
`915`	`925`	`RESET SESSION AUTHORIZATION;`
`916`	`926`
	`927`	`+-- Suppress NOTICE messages when doing a cascaded drop.`
	`928`	`+SET client_min_messages TO'warning';`
	`929`	`+`
`917`	`930`	`DROPSCHEMA rls_regress_schema CASCADE;`
	`931`	`+RESET client_min_messages;`
`918`	`932`
`919`	`933`	`DROPUSER rls_regress_user0;`
`920`	`934`	`DROPUSER rls_regress_user1;`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit81d815d

File tree

2 files changed

2 files changed

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

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

0 commit comments