diff options
| author | Peter Geoghegan <pg@bowt.ie> | 2019-03-21 15:33:13 -0700 |
|---|---|---|
| committer | Peter Geoghegan <pg@bowt.ie> | 2019-03-21 15:33:13 -0700 |
| commit | fff518d051285bc47e2694a349d410e01972730b (patch) | |
| tree | 545ceaa2a38b092d809bfd6cc6efec9edba19c45 | |
| parent | 03ae9d59bd5f5ef9a1cb387568e5cbf12b9c7b10 (diff) | |
| download | postgresql-fff518d051285bc47e2694a349d410e01972730b.tar.gz postgresql-fff518d051285bc47e2694a349d410e01972730b.zip | |
Revert "Suppress DETAIL output from a foreign_data test."
This should be superseded by commit 8aa9dd74.
| -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, 4 insertions, 6 deletions
diff --git a/src/test/regress/expected/foreign_data.out b/src/test/regress/expected/foreign_data.out index 455926f1071..0b7582accbd 100644 --- a/src/test/regress/expected/foreign_data.out +++ b/src/test/regress/expected/foreign_data.out @@ -439,11 +439,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 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 -\set VERBOSITY default +DETAIL: privileges for foreign-data wrapper foo +owner of server s1 \des+ List of foreign servers Name | Owner | Foreign-data wrapper | Access privileges | Type | Version | FDW options | Description @@ -1204,6 +1203,7 @@ 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 657dc456271..1cc1f6e0129 100644 --- a/src/test/regress/sql/foreign_data.sql +++ b/src/test/regress/sql/foreign_data.sql @@ -199,10 +199,7 @@ 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 detail output. -\set VERBOSITY terse DROP ROLE regress_test_indirect; -- ERROR -\set VERBOSITY default \des+ ALTER SERVER s8 RENAME to s8new; @@ -504,6 +501,7 @@ 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 |