Support EXTENSION.

Since FDW appears from 9.1 as well, we don't bother multi-version support for this module.
umitanuki · May 13, 2011 · 58a2fa2 · 58a2fa2
1 parent 12bda65
commit 58a2fa2
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 16 deletions.
diff --git a/Makefile b/Makefile
@@ -3,9 +3,9 @@
 LIBJSON = libjson-0.8
 MODULE_big = twitter_fdw
 OBJS	= twitter_fdw.o $(LIBJSON)/json.o
+EXTENSION = twitter_fdw
+DATA = twitter_fdw--1.0.sql
 
-DATA_built = twitter_fdw.sql 
-DATA = uninstall_twitter_fdw.sql 
 REGRESS = twitter_fdw
 SHLIB_LINK = -lcurl
 

diff --git a/expected/twitter_fdw.out b/expected/twitter_fdw.out
@@ -1,6 +1,4 @@
-SET client_min_messages = warning;
+CREATE EXTENSION twitter_fdw;
-\set ECHO none
-RESET client_min_messages;
 SELECT count(*) FROM twitter;
  count 
 -------

diff --git a/sql/twitter_fdw.sql b/sql/twitter_fdw.sql
@@ -1,8 +1,4 @@
-SET client_min_messages = warning;
+CREATE EXTENSION twitter_fdw;
-\set ECHO none
-\i twitter_fdw.sql
-\set ECHO all
-RESET client_min_messages;
 
 SELECT count(*) FROM twitter;
 

diff --git a/twitter_fdw.sql.in → twitter_fdw--1.0.sql b/twitter_fdw.sql.in → twitter_fdw--1.0.sql
@@ -1,17 +1,14 @@
-/* contrib/twitter_fdw/twitter_fdw.sql.in */
+/* contrib/twitter_fdw/twitter_fdw--1.0.sql */
-
--- Adjust this setting to control where the objects get created.
-SET search_path = public;
 
 -- create wrapper with validator and handler
 CREATE OR REPLACE FUNCTION twitter_fdw_validator (text[], oid)
 RETURNS bool
-AS 'MODULE_PATHNAME','twitter_fdw_validator'
+AS 'MODULE_PATHNAME'
 LANGUAGE C STRICT;
 
 CREATE OR REPLACE FUNCTION twitter_fdw_handler ()
 RETURNS fdw_handler
-AS 'MODULE_PATHNAME','twitter_fdw_handler'
+AS 'MODULE_PATHNAME'
 LANGUAGE C STRICT;
 
 CREATE FOREIGN DATA WRAPPER twitter_fdw