Merge dblink's paths test script into its main test.

There's no longer any reason to fire up a separate psql run
to create these functions.  (Some refactoring in the main
regression tests is also called for, but that will take
more thought.)

Discussion: https://postgr.es/m/1655733.1639871614@sss.pgh.pa.us

2 files changed, 23 insertions, 23 deletions

diff --git a/contrib/dblink/sql/dblink.sql b/contrib/dblink/sql/dblink.sql
index 7a71817d65b..e560260bfcf 100644
--- a/contrib/dblink/sql/dblink.sql
+++ b/contrib/dblink/sql/dblink.sql
@@ -1,5 +1,28 @@
 CREATE EXTENSION dblink;
 
+-- directory paths and dlsuffix are passed to us in environment variables
+\getenv abs_srcdir PG_ABS_SRCDIR
+\getenv libdir PG_LIBDIR
+\getenv dlsuffix PG_DLSUFFIX
+
+\set regresslib :libdir '/regress' :dlsuffix
+
+-- create some functions needed for tests
+CREATE FUNCTION setenv(text, text)
+   RETURNS void
+   AS :'regresslib', 'regress_setenv'
+   LANGUAGE C STRICT;
+
+CREATE FUNCTION wait_pid(int)
+   RETURNS void
+   AS :'regresslib'
+   LANGUAGE C STRICT;
+
+\set path :abs_srcdir '/'
+\set fnbody 'SELECT setenv(''PGSERVICEFILE'', ' :'path' ' || $1)'
+CREATE FUNCTION set_pgservicefile(text) RETURNS void LANGUAGE SQL
+    AS :'fnbody';
+
 -- want context for notices
 \set SHOW_CONTEXT always
 
diff --git a/contrib/dblink/sql/paths.sql b/contrib/dblink/sql/paths.sql
deleted file mode 100644
index 30403d9d5f7..00000000000
--- a/contrib/dblink/sql/paths.sql
+++ /dev/null
@@ -1,23 +0,0 @@
--- Initialization that requires path substitution.
-
--- directory paths and dlsuffix are passed to us in environment variables
-\getenv abs_srcdir PG_ABS_SRCDIR
-\getenv libdir PG_LIBDIR
-\getenv dlsuffix PG_DLSUFFIX
-
-\set regresslib :libdir '/regress' :dlsuffix
-
-CREATE FUNCTION setenv(text, text)
-   RETURNS void
-   AS :'regresslib', 'regress_setenv'
-   LANGUAGE C STRICT;
-
-CREATE FUNCTION wait_pid(int)
-   RETURNS void
-   AS :'regresslib'
-   LANGUAGE C STRICT;
-
-\set path :abs_srcdir '/'
-\set fnbody 'SELECT setenv(''PGSERVICEFILE'', ' :'path' ' || $1)'
-CREATE FUNCTION set_pgservicefile(text) RETURNS void LANGUAGE SQL
-    AS :'fnbody';