diff options
| -rw-r--r-- | contrib/postgres_fdw/expected/postgres_fdw.out | 6 | ||||
| -rw-r--r-- | contrib/postgres_fdw/sql/postgres_fdw.sql | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/contrib/postgres_fdw/expected/postgres_fdw.out b/contrib/postgres_fdw/expected/postgres_fdw.out index e33c92d7f1c..9d77d6e8505 100644 --- a/contrib/postgres_fdw/expected/postgres_fdw.out +++ b/contrib/postgres_fdw/expected/postgres_fdw.out @@ -9216,15 +9216,15 @@ NOTICE: drop cascades to 2 other objects DETAIL: drop cascades to user mapping for public on server loopback4 drop cascades to foreign table ft8 -- Return false as connections are still in use, warnings are issued. +-- But disable warnings temporarily because the order of them is not stable. +SET client_min_messages = 'ERROR'; SELECT postgres_fdw_disconnect_all(); -WARNING: cannot close dropped server connection because it is still in use -WARNING: cannot close connection for server "loopback" because it is still in use -WARNING: cannot close connection for server "loopback2" because it is still in use postgres_fdw_disconnect_all ----------------------------- f (1 row) +RESET client_min_messages; COMMIT; -- Close loopback2 connection and return true. SELECT postgres_fdw_disconnect('loopback2'); diff --git a/contrib/postgres_fdw/sql/postgres_fdw.sql b/contrib/postgres_fdw/sql/postgres_fdw.sql index 9473ab07623..62382d1a55f 100644 --- a/contrib/postgres_fdw/sql/postgres_fdw.sql +++ b/contrib/postgres_fdw/sql/postgres_fdw.sql @@ -2779,7 +2779,10 @@ SELECT 1 FROM ft8 LIMIT 1; SELECT * FROM postgres_fdw_get_connections() ORDER BY 1; DROP SERVER loopback4 CASCADE; -- Return false as connections are still in use, warnings are issued. +-- But disable warnings temporarily because the order of them is not stable. +SET client_min_messages = 'ERROR'; SELECT postgres_fdw_disconnect_all(); +RESET client_min_messages; COMMIT; -- Close loopback2 connection and return true. SELECT postgres_fdw_disconnect('loopback2'); |