database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-06-22 02:52:08 +03:00
Code Activity

Suppress DETAIL output from a foreign_data test.

Browse Source 
Unstable sort order related to changes to nbtree from commit dd299df8
can cause two lines of DETAIL output to be in opposite-of-expected
order.  Suppress the output using the same VERBOSITY hack that is used
elsewhere in the foreign_data tests.

Note that the same foreign_data.out DETAIL output was mechanically
updated by commit dd299df8.  Only a few such changes were required,
though.

Per buildfarm member batfish.

Discussion: https://postgr.es/m/CAH2-WzkCQ_MtKeOpzozj7QhhgP1unXsK8o9DMAFvDqQFEPpkYQ@mail.gmail.com
This commit is contained in:
Peter Geoghegan
2019-03-20 13:38:38 -07:00
parent 815b20ae0c
commit 7d3bf73ac4
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/test/regress/expected/foreign_data.out
View File

@ -439,10 +439,11 @@ GRANT USAGE ON FOREIGN DATA WRAPPER foo TO regress_test_indirect;
SET ROLE regress_test_role; SET ROLE regress_test_role;
ALTER SERVER s1 OWNER TO regress_test_indirect; ALTER SERVER s1 OWNER TO regress_test_indirect;
RESET ROLE; RESET ROLE;
-- We use terse mode to avoid ordering issues in detail output.
\set VERBOSITY terse
DROP ROLE regress_test_indirect; -- ERROR DROP ROLE regress_test_indirect; -- ERROR
ERROR: role "regress_test_indirect" cannot be dropped because some objects depend on it ERROR: role "regress_test_indirect" cannot be dropped because some objects depend on it
DETAIL: privileges for foreign-data wrapper foo \set VERBOSITY default
owner of server s1
\des+ \des+
List of foreign servers List of foreign servers
Name | Owner | Foreign-data wrapper | Access privileges | Type | Version | FDW options | Description 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'; ALTER SERVER s9 VERSION '1.1';
GRANT USAGE ON FOREIGN SERVER s9 TO regress_test_role; GRANT USAGE ON FOREIGN SERVER s9 TO regress_test_role;
CREATE USER MAPPING FOR current_user SERVER s9; CREATE USER MAPPING FOR current_user SERVER s9;
-- We use terse mode to avoid ordering issues in cascade detail output.
\set VERBOSITY terse \set VERBOSITY terse
DROP SERVER s9 CASCADE; DROP SERVER s9 CASCADE;
NOTICE: drop cascades to 2 other objects NOTICE: drop cascades to 2 other objects

4
src/test/regress/sql/foreign_data.sql
View File

@ -199,7 +199,10 @@ GRANT USAGE ON FOREIGN DATA WRAPPER foo TO regress_test_indirect;
SET ROLE regress_test_role; SET ROLE regress_test_role;
ALTER SERVER s1 OWNER TO regress_test_indirect; ALTER SERVER s1 OWNER TO regress_test_indirect;
RESET ROLE; RESET ROLE;
-- We use terse mode to avoid ordering issues in detail output.
\set VERBOSITY terse
DROP ROLE regress_test_indirect; -- ERROR DROP ROLE regress_test_indirect; -- ERROR
\set VERBOSITY default
\des+ \des+
ALTER SERVER s8 RENAME to s8new; ALTER SERVER s8 RENAME to s8new;
@ -501,7 +504,6 @@ CREATE SERVER s10 FOREIGN DATA WRAPPER foo; -- ERROR
ALTER SERVER s9 VERSION '1.1'; ALTER SERVER s9 VERSION '1.1';
GRANT USAGE ON FOREIGN SERVER s9 TO regress_test_role; GRANT USAGE ON FOREIGN SERVER s9 TO regress_test_role;
CREATE USER MAPPING FOR current_user SERVER s9; CREATE USER MAPPING FOR current_user SERVER s9;
-- We use terse mode to avoid ordering issues in cascade detail output.
\set VERBOSITY terse \set VERBOSITY terse
DROP SERVER s9 CASCADE; DROP SERVER s9 CASCADE;
\set VERBOSITY default \set VERBOSITY default