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.

diff --git a/contrib/dblink/expected/dblink.out b/contrib/dblink/expected/dblink.out
index 60cca8254d8d8263b5e17d7d846e75739d4ce567..a49b5629a11602e52997cecef2ba46d5f447a007 100644 (file)
--- 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 d00e7d1c41a518f1ef4ad8a9090c43fc2b901872..ea78cc2929b3a8147c9e87fb978da700ba3df4b7 100644 (file)
--- 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 5fe752a1bbe61294faa2e3b1707feeb51d5630b7..f7e11edab1234debdc2b7fac1e1dd05a63dd5c80 100644 (file)
--- 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 ba5ef91f6a0b9710a2b4188f183de43147145f18..ae9668463c4a7f0a5064873b0c2b4d77a35e0d28 100644 (file)
--- 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$;