Create FOREIGN DATA WRAPPER postgresql_fdw during installation of

postgresql_fdw contrib module.

diff --git a/contrib/postgresql_fdw/expected/postgresql_fdw.out b/contrib/postgresql_fdw/expected/postgresql_fdw.out
index c372a8f8afe5222335dea4089cecddcc5b0d48f3..ab715f3bffabddaf5d0d1d1162b62099c25c3236 100644 (file)
--- a/contrib/postgresql_fdw/expected/postgresql_fdw.out
+++ b/contrib/postgresql_fdw/expected/postgresql_fdw.out
@@ -9,9 +9,6 @@ SET DATESTYLE = 'Postgres, MDY';
 SET client_min_messages = warning;
 \set ECHO none
 -- define fdw-related objects
-CREATE FOREIGN DATA WRAPPER postgresql_fdw
-   HANDLER postgresql_fdw_handler
-   VALIDATOR postgresql_fdw_validator;
 CREATE SERVER loopback1 FOREIGN DATA WRAPPER postgresql_fdw
    OPTIONS (dbname 'contrib_regression');
 CREATE SERVER loopback2 FOREIGN DATA WRAPPER postgresql_fdw

diff --git a/contrib/postgresql_fdw/postgresql_fdw.sql.in b/contrib/postgresql_fdw/postgresql_fdw.sql.in
index 5afd418b4070cdee61b7325a8b3ef24e705c40e9..93d5926200e5fb452f94df5666497835bdb0aa76 100644 (file)
--- a/contrib/postgresql_fdw/postgresql_fdw.sql.in
+++ b/contrib/postgresql_fdw/postgresql_fdw.sql.in
@@ -7,3 +7,8 @@ CREATE OR REPLACE FUNCTION postgresql_fdw_handler ()
 RETURNS fdw_handler
 AS 'MODULE_PATHNAME','postgresql_fdw_handler'
 LANGUAGE C STRICT;
+
+CREATE FOREIGN DATA WRAPPER postgresql_fdw
+VALIDATOR postgresql_fdw_validator
+HANDLER postgresql_fdw_handler;
+

diff --git a/contrib/postgresql_fdw/sql/postgresql_fdw.sql b/contrib/postgresql_fdw/sql/postgresql_fdw.sql
index 8d918aed194ee8b7a0c0239c59a9975056b7b9fb..de0633b790e69b365b4c69821f0214907c0bfa91 100644 (file)
--- a/contrib/postgresql_fdw/sql/postgresql_fdw.sql
+++ b/contrib/postgresql_fdw/sql/postgresql_fdw.sql
@@ -14,10 +14,6 @@ SET client_min_messages = warning;
 \set ECHO all
 
 -- define fdw-related objects
-CREATE FOREIGN DATA WRAPPER postgresql_fdw
-   HANDLER postgresql_fdw_handler
-   VALIDATOR postgresql_fdw_validator;
-
 CREATE SERVER loopback1 FOREIGN DATA WRAPPER postgresql_fdw
    OPTIONS (dbname 'contrib_regression');
 CREATE SERVER loopback2 FOREIGN DATA WRAPPER postgresql_fdw

diff --git a/contrib/postgresql_fdw/uninstall_postgresql_fdw.sql b/contrib/postgresql_fdw/uninstall_postgresql_fdw.sql
index 1f6d660dafb18f28ad91c6b1571180d090cf2077..af39f54a497b44fc37b6277b7096f6c6418a3f8b 100644 (file)
--- a/contrib/postgresql_fdw/uninstall_postgresql_fdw.sql
+++ b/contrib/postgresql_fdw/uninstall_postgresql_fdw.sql
@@ -3,4 +3,5 @@
 -- Adjust this setting to control where the objects get dropped.
 set search_path = public;
 
+DROP FOREIGN DATA WRAPPER postgresql_fdw;
 DROP FUNCTION postgresql_fdw_handler ();