NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit09963ce

committed

Go back to suppressing foreign_data DETAIL test output.

This is almost a straight revert of commitfff518d, which itself was arevert of7d3bf73.It turns out that commit8aa9dd7, which sorted dependent objects beforedeletion in DROP OWNED BY, was not sufficient to make all remainingunstable DETAIL output stable. Unstable DETAIL output from DROP ROLEwas not affected, because that happens to use a different code path. Itdoesn't seem worthwhile to fix the other code path at this time.Discussion:https://postgr.es/m/6226.1553274783@sss.pgh.pa.us

1 parentc8151e6 commit09963ceCopy full SHA for 09963ce

File tree

2 files changed

-4

lines changed

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

2 files changed

-4

lines changed

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

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -439,10 +439,11 @@ GRANT USAGE ON FOREIGN DATA WRAPPER foo TO regress_test_indirect;`
`439`	`439`	`SET ROLE regress_test_role;`
`440`	`440`	`ALTER SERVER s1 OWNER TO regress_test_indirect;`
`441`	`441`	`RESET ROLE;`
	`442`	`+-- We use terse mode to avoid ordering issues in DROP ROLE detail output`
	`443`	`+\set VERBOSITY terse`
`442`	`444`	`DROP ROLE regress_test_indirect; -- ERROR`
`443`	`445`	`ERROR: role "regress_test_indirect" cannot be dropped because some objects depend on it`
`444`		`-DETAIL: privileges for foreign-data wrapper foo`
`445`		`-owner of server s1`
	`446`	`+\set VERBOSITY default`
`446`	`447`	`\des+`
`447`	`448`	`List of foreign servers`
`448`	`449`	`Name \| Owner \| Foreign-data wrapper \| Access privileges \| Type \| Version \| FDW options \| Description`
`@@ -1203,7 +1204,6 @@ ERROR: permission denied for foreign-data wrapper foo`
`1203`	`1204`	`ALTER SERVER s9 VERSION '1.1';`
`1204`	`1205`	`GRANT USAGE ON FOREIGN SERVER s9 TO regress_test_role;`
`1205`	`1206`	`CREATE USER MAPPING FOR current_user SERVER s9;`
`1206`		`--- We use terse mode to avoid ordering issues in cascade detail output.`
`1207`	`1207`	`\set VERBOSITY terse`
`1208`	`1208`	`DROP SERVER s9 CASCADE;`
`1209`	`1209`	`NOTICE: drop cascades to 2 other objects`

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

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -199,7 +199,10 @@ GRANT USAGE ON FOREIGN DATA WRAPPER foo TO regress_test_indirect;`
`199`	`199`	`SET ROLE regress_test_role;`
`200`	`200`	`ALTER SERVER s1 OWNER TO regress_test_indirect;`
`201`	`201`	`RESET ROLE;`
	`202`	`+-- We use terse mode to avoid ordering issues in DROP ROLE detail output`
	`203`	`+\set VERBOSITY terse`
`202`	`204`	`DROP ROLE regress_test_indirect;-- ERROR`
	`205`	`+\set VERBOSITY default`
`203`	`206`	`\des+`
`204`	`207`
`205`	`208`	`ALTER SERVER s8 RENAME to s8new;`
`@@ -501,7 +504,6 @@ CREATE SERVER s10 FOREIGN DATA WRAPPER foo; -- ERROR`
`501`	`504`	`ALTER SERVER s9 VERSION'1.1';`
`502`	`505`	`GRANT USAGEON FOREIGN SERVER s9 TO regress_test_role;`
`503`	`506`	`CREATEUSERMAPPING FORcurrent_user SERVER s9;`
`504`		`--- We use terse mode to avoid ordering issues in cascade detail output.`
`505`	`507`	`\set VERBOSITY terse`
`506`	`508`	`DROP SERVER s9 CASCADE;`
`507`	`509`	`\set VERBOSITY default`

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!

Commit09963ce

File tree

2 files changed

2 files changed

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

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

0 commit comments