diff options
| -rw-r--r-- | src/test/regress/expected/foreign_data.out | 6 | ||||
| -rw-r--r-- | src/test/regress/sql/foreign_data.sql | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/test/regress/expected/foreign_data.out b/src/test/regress/expected/foreign_data.out index 0b7582accbd..84727e20e46 100644 --- a/src/test/regress/expected/foreign_data.out +++ b/src/test/regress/expected/foreign_data.out @@ -439,10 +439,11 @@ GRANT USAGE ON FOREIGN DATA WRAPPER foo TO regress_test_indirect; SET ROLE regress_test_role; ALTER SERVER s1 OWNER TO regress_test_indirect; RESET ROLE; +-- We use terse mode to avoid ordering issues in DROP ROLE detail output +\set VERBOSITY terse DROP ROLE regress_test_indirect; -- ERROR ERROR: role "regress_test_indirect" cannot be dropped because some objects depend on it -DETAIL: privileges for foreign-data wrapper foo -owner of server s1 +\set VERBOSITY default \des+ List of foreign servers Name | Owner | Foreign-data wrapper | Access privileges | Type | Version | FDW options | Description @@ -1203,7 +1204,6 @@ ERROR: permission denied for foreign-data wrapper foo ALTER SERVER s9 VERSION '1.1'; GRANT USAGE ON FOREIGN SERVER s9 TO regress_test_role; CREATE USER MAPPING FOR current_user SERVER s9; --- We use terse mode to avoid ordering issues in cascade detail output. \set VERBOSITY terse DROP SERVER s9 CASCADE; NOTICE: drop cascades to 2 other objects diff --git a/src/test/regress/sql/foreign_data.sql b/src/test/regress/sql/foreign_data.sql index 1cc1f6e0129..6ceef8780fe 100644 --- a/src/test/regress/sql/foreign_data.sql +++ b/src/test/regress/sql/foreign_data.sql @@ -199,7 +199,10 @@ GRANT USAGE ON FOREIGN DATA WRAPPER foo TO regress_test_indirect; SET ROLE regress_test_role; ALTER SERVER s1 OWNER TO regress_test_indirect; RESET ROLE; +-- We use terse mode to avoid ordering issues in DROP ROLE detail output +\set VERBOSITY terse DROP ROLE regress_test_indirect; -- ERROR +\set VERBOSITY default \des+ ALTER SERVER s8 RENAME to s8new; @@ -501,7 +504,6 @@ CREATE SERVER s10 FOREIGN DATA WRAPPER foo; -- ERROR ALTER SERVER s9 VERSION '1.1'; GRANT USAGE ON FOREIGN SERVER s9 TO regress_test_role; CREATE USER MAPPING FOR current_user SERVER s9; --- We use terse mode to avoid ordering issues in cascade detail output. \set VERBOSITY terse DROP SERVER s9 CASCADE; \set VERBOSITY default |