From 57ca1d4f0175f60e9cfb0f997c864173d9c72607 Mon Sep 17 00:00:00 2001 From: Andres Freund Date: Tue, 26 Aug 2014 12:21:06 +0200 Subject: [PATCH] Specify the port in dblink and postgres_fdw tests. That allows to run those tests against a postmaster listening on a nonstandard port without requiring to export PGPORT in postmaster's environment. This still doesn't support connecting to a nondefault host without configuring it in postmaster's environment. That's harder and less frequently used though. So this is a useful step. --- contrib/dblink/expected/dblink.out | 6 ++++-- contrib/dblink/sql/dblink.sql | 6 ++++-- contrib/postgres_fdw/expected/postgres_fdw.out | 4 +++- contrib/postgres_fdw/sql/postgres_fdw.sql | 4 +++- 4 files changed, 14 insertions(+), 6 deletions(-) diff --git a/contrib/dblink/expected/dblink.out b/contrib/dblink/expected/dblink.out index 60cca8254d..a49b5629a1 100644 --- a/contrib/dblink/expected/dblink.out +++ b/contrib/dblink/expected/dblink.out @@ -89,7 +89,7 @@ SELECT dblink_build_sql_delete('"MySchema"."Foo"','1 2',2,'{"0", "a"}'); (1 row) CREATE FUNCTION connection_parameters() RETURNS text LANGUAGE SQL AS $f$ - SELECT $$dbname='$$||current_database()||$$'$$; + SELECT $$dbname='$$||current_database()||$$' port=$$||current_setting('port'); $f$; -- regular old dblink SELECT * @@ -816,7 +816,9 @@ CREATE ROLE dblink_regression_test; DO $d$ BEGIN EXECUTE $$CREATE SERVER fdtest FOREIGN DATA WRAPPER dblink_fdw - OPTIONS (dbname '$$||current_database()||$$')$$; + OPTIONS (dbname '$$||current_database()||$$', + port '$$||current_setting('port')||$$' + )$$; END; $d$; CREATE USER MAPPING FOR public SERVER fdtest diff --git a/contrib/dblink/sql/dblink.sql b/contrib/dblink/sql/dblink.sql index d00e7d1c41..ea78cc2929 100644 --- a/contrib/dblink/sql/dblink.sql +++ b/contrib/dblink/sql/dblink.sql @@ -56,7 +56,7 @@ SELECT dblink_build_sql_update('"MySchema"."Foo"','1 2',2,'{"0", "a"}','{"99", " SELECT dblink_build_sql_delete('"MySchema"."Foo"','1 2',2,'{"0", "a"}'); CREATE FUNCTION connection_parameters() RETURNS text LANGUAGE SQL AS $f$ - SELECT $$dbname='$$||current_database()||$$'$$; + SELECT $$dbname='$$||current_database()||$$' port=$$||current_setting('port'); $f$; -- regular old dblink @@ -395,7 +395,9 @@ CREATE ROLE dblink_regression_test; DO $d$ BEGIN EXECUTE $$CREATE SERVER fdtest FOREIGN DATA WRAPPER dblink_fdw - OPTIONS (dbname '$$||current_database()||$$')$$; + OPTIONS (dbname '$$||current_database()||$$', + port '$$||current_setting('port')||$$' + )$$; END; $d$; diff --git a/contrib/postgres_fdw/expected/postgres_fdw.out b/contrib/postgres_fdw/expected/postgres_fdw.out index 5fe752a1bb..f7e11edab1 100644 --- a/contrib/postgres_fdw/expected/postgres_fdw.out +++ b/contrib/postgres_fdw/expected/postgres_fdw.out @@ -6,7 +6,9 @@ CREATE SERVER testserver1 FOREIGN DATA WRAPPER postgres_fdw; DO $d$ BEGIN EXECUTE $$CREATE SERVER loopback FOREIGN DATA WRAPPER postgres_fdw - OPTIONS (dbname '$$||current_database()||$$');$$; + OPTIONS (dbname '$$||current_database()||$$', + port '$$||current_setting('port')||$$' + )$$; END; $d$; CREATE USER MAPPING FOR public SERVER testserver1 diff --git a/contrib/postgres_fdw/sql/postgres_fdw.sql b/contrib/postgres_fdw/sql/postgres_fdw.sql index ba5ef91f6a..ae9668463c 100644 --- a/contrib/postgres_fdw/sql/postgres_fdw.sql +++ b/contrib/postgres_fdw/sql/postgres_fdw.sql @@ -8,7 +8,9 @@ CREATE SERVER testserver1 FOREIGN DATA WRAPPER postgres_fdw; DO $d$ BEGIN EXECUTE $$CREATE SERVER loopback FOREIGN DATA WRAPPER postgres_fdw - OPTIONS (dbname '$$||current_database()||$$');$$; + OPTIONS (dbname '$$||current_database()||$$', + port '$$||current_setting('port')||$$' + )$$; END; $d$; -- 2.49.0