aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFujii Masao <fujii@postgresql.org>2021-12-24 17:39:59 +0900
committerFujii Masao <fujii@postgresql.org>2021-12-24 17:39:59 +0900
commit5e64ad369771b66bb3e916aade735defce6e65a1 (patch)
treea25af02d37e51f29136c442f8b315f588af19f1b
parent6e0cb3dec10e460288d68a128e3d79d16a230cdb (diff)
downloadpostgresql-5e64ad369771b66bb3e916aade735defce6e65a1.tar.gz
postgresql-5e64ad369771b66bb3e916aade735defce6e65a1.zip
postgres_fdw: Revert unstable tests for postgres_fdw.application_name.
Commit 6e0cb3dec1 added the tests that check that escape sequences in postgres_fdw.application_name setting are replaced with status information expectedly. But they were unstable and caused some buildfarm members to report the failure. This commit reverts those unstable tests.
-rw-r--r--contrib/postgres_fdw/expected/postgres_fdw.out32
-rw-r--r--contrib/postgres_fdw/sql/postgres_fdw.sql21
2 files changed, 0 insertions, 53 deletions
diff --git a/contrib/postgres_fdw/expected/postgres_fdw.out b/contrib/postgres_fdw/expected/postgres_fdw.out
index 6ce7ec24f08..7720ab9c581 100644
--- a/contrib/postgres_fdw/expected/postgres_fdw.out
+++ b/contrib/postgres_fdw/expected/postgres_fdw.out
@@ -10825,35 +10825,3 @@ ERROR: invalid value for integer option "batch_size": 100$%$#$#
ALTER FOREIGN DATA WRAPPER postgres_fdw OPTIONS (nonexistent 'fdw');
ERROR: invalid option "nonexistent"
HINT: There are no valid options in this context.
--- ===================================================================
--- test postgres_fdw.application_name GUC
--- ===================================================================
--- Close all the existing cached connections so that new connection
--- will be established with new setting of postgres_fdw.application_name.
-SELECT 1 FROM postgres_fdw_disconnect_all();
- ?column?
-----------
- 1
-(1 row)
-
--- Add some escape sequences into postgres_fdw.application_name
--- so as to test that they are replaced with status information expectedly.
-SET postgres_fdw.application_name TO '%a%u%d%p%%';
-BEGIN;
-SELECT 1 FROM ft6 LIMIT 1;
- ?column?
-----------
- 1
-(1 row)
-
-SELECT count(*) FROM pg_stat_activity
- WHERE application_name = current_setting('application_name') ||
- CURRENT_USER || current_database() || pg_backend_pid() || '%';
- count
--------
- 1
-(1 row)
-
-COMMIT;
---Clean up
-RESET postgres_fdw.application_name;
diff --git a/contrib/postgres_fdw/sql/postgres_fdw.sql b/contrib/postgres_fdw/sql/postgres_fdw.sql
index 105b133bbd1..beeac8af1ed 100644
--- a/contrib/postgres_fdw/sql/postgres_fdw.sql
+++ b/contrib/postgres_fdw/sql/postgres_fdw.sql
@@ -3452,24 +3452,3 @@ CREATE FOREIGN TABLE inv_bsz (c1 int )
-- No option is allowed to be specified at foreign data wrapper level
ALTER FOREIGN DATA WRAPPER postgres_fdw OPTIONS (nonexistent 'fdw');
-
--- ===================================================================
--- test postgres_fdw.application_name GUC
--- ===================================================================
--- Close all the existing cached connections so that new connection
--- will be established with new setting of postgres_fdw.application_name.
-SELECT 1 FROM postgres_fdw_disconnect_all();
-
--- Add some escape sequences into postgres_fdw.application_name
--- so as to test that they are replaced with status information expectedly.
-SET postgres_fdw.application_name TO '%a%u%d%p%%';
-
-BEGIN;
-SELECT 1 FROM ft6 LIMIT 1;
-SELECT count(*) FROM pg_stat_activity
- WHERE application_name = current_setting('application_name') ||
- CURRENT_USER || current_database() || pg_backend_pid() || '%';
-COMMIT;
-
---Clean up
-RESET postgres_fdw.application_name;