aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--contrib/postgres_fdw/expected/postgres_fdw.out8
-rw-r--r--contrib/postgres_fdw/sql/postgres_fdw.sql3
2 files changed, 7 insertions, 4 deletions
diff --git a/contrib/postgres_fdw/expected/postgres_fdw.out b/contrib/postgres_fdw/expected/postgres_fdw.out
index 2c5614073f9..2d88d063583 100644
--- a/contrib/postgres_fdw/expected/postgres_fdw.out
+++ b/contrib/postgres_fdw/expected/postgres_fdw.out
@@ -9025,13 +9025,13 @@ SELECT 1 FROM ft1 LIMIT 1;
-- If the query detects the broken connection when starting new remote
-- subtransaction, it doesn't reestablish new connection and should fail.
+-- The text of the error might vary across platforms, so don't show it.
CALL terminate_backend_and_wait('fdw_retry_check');
SAVEPOINT s;
+\set VERBOSITY sqlstate
SELECT 1 FROM ft1 LIMIT 1; -- should fail
-ERROR: server closed the connection unexpectedly
- This probably means the server terminated abnormally
- before or while processing the request.
-CONTEXT: remote SQL command: SAVEPOINT s2
+ERROR: 08006
+\set VERBOSITY default
COMMIT;
-- Clean up
DROP PROCEDURE terminate_backend_and_wait(text);
diff --git a/contrib/postgres_fdw/sql/postgres_fdw.sql b/contrib/postgres_fdw/sql/postgres_fdw.sql
index 4da1f78956e..7581c5417b9 100644
--- a/contrib/postgres_fdw/sql/postgres_fdw.sql
+++ b/contrib/postgres_fdw/sql/postgres_fdw.sql
@@ -2687,9 +2687,12 @@ SELECT 1 FROM ft1 LIMIT 1;
-- If the query detects the broken connection when starting new remote
-- subtransaction, it doesn't reestablish new connection and should fail.
+-- The text of the error might vary across platforms, so don't show it.
CALL terminate_backend_and_wait('fdw_retry_check');
SAVEPOINT s;
+\set VERBOSITY sqlstate
SELECT 1 FROM ft1 LIMIT 1; -- should fail
+\set VERBOSITY default
COMMIT;
-- Clean up