Convert contrib modules to use the extension facility.

This isn't fully tested as yet, in particular I'm not sure that the
"foo--unpackaged--1.0.sql" scripts are OK.  But it's time to get some
buildfarm cycles on it.

sepgsql is not converted to an extension, mainly because it seems to
require a very nonstandard installation process.

Dimitri Fontaine and Tom Lane

8 files changed, 19 insertions, 37 deletions

diff --git a/contrib/test_parser/.gitignore b/contrib/test_parser/.gitignore
index c07f518855..19b6c5ba42 100644
--- a/contrib/test_parser/.gitignore
+++ b/contrib/test_parser/.gitignore
@@ -1,3 +1,2 @@
-/test_parser.sql
 # Generated subdirectories
 /results/
diff --git a/contrib/test_parser/Makefile b/contrib/test_parser/Makefile
index ad4e0ec9b8..b9766cb023 100644
--- a/contrib/test_parser/Makefile
+++ b/contrib/test_parser/Makefile
@@ -2,8 +2,10 @@
 
 MODULE_big = test_parser
 OBJS = test_parser.o
-DATA_built = test_parser.sql
-DATA = uninstall_test_parser.sql
+
+EXTENSION = test_parser
+DATA = test_parser--1.0.sql test_parser--unpackaged--1.0.sql
+
 REGRESS = test_parser
 
 ifdef USE_PGXS
diff --git a/contrib/test_parser/expected/test_parser.out b/contrib/test_parser/expected/test_parser.out
index 3d0fd4210f..8a49bc01e3 100644
--- a/contrib/test_parser/expected/test_parser.out
+++ b/contrib/test_parser/expected/test_parser.out
@@ -1,10 +1,4 @@
---
--- first, define the parser.  Turn off echoing so that expected file
--- does not depend on contents of this file.
---
-SET client_min_messages = warning;
-\set ECHO none
-RESET client_min_messages;
+CREATE EXTENSION test_parser;
 -- make test configuration using parser
 CREATE TEXT SEARCH CONFIGURATION testcfg (PARSER = testparser);
 ALTER TEXT SEARCH CONFIGURATION testcfg ADD MAPPING FOR word WITH simple;
diff --git a/contrib/test_parser/sql/test_parser.sql b/contrib/test_parser/sql/test_parser.sql
index 97c2cb5a5d..1f21504602 100644
--- a/contrib/test_parser/sql/test_parser.sql
+++ b/contrib/test_parser/sql/test_parser.sql
@@ -1,12 +1,4 @@
---
--- first, define the parser.  Turn off echoing so that expected file
--- does not depend on contents of this file.
---
-SET client_min_messages = warning;
-\set ECHO none
-\i test_parser.sql
-\set ECHO all
-RESET client_min_messages;
+CREATE EXTENSION test_parser;
 
 -- make test configuration using parser
 
diff --git a/contrib/test_parser/test_parser.sql.in b/contrib/test_parser/test_parser--1.0.sql
index bab97a2987..fb785a1c4a 100644
--- a/contrib/test_parser/test_parser.sql.in
+++ b/contrib/test_parser/test_parser--1.0.sql
@@ -1,7 +1,4 @@
-/* contrib/test_parser/test_parser.sql.in */
-
--- Adjust this setting to control where the objects get created.
-SET search_path = public;
+/* contrib/test_parser/test_parser--1.0.sql */
 
 CREATE OR REPLACE FUNCTION testprs_start(internal, int4)
 RETURNS internal
diff --git a/contrib/test_parser/test_parser--unpackaged--1.0.sql b/contrib/test_parser/test_parser--unpackaged--1.0.sql
new file mode 100644
index 0000000000..e240ab2b5b
--- /dev/null
+++ b/contrib/test_parser/test_parser--unpackaged--1.0.sql
@@ -0,0 +1,7 @@
+/* contrib/test_parser/test_parser--unpackaged--1.0.sql */
+
+ALTER EXTENSION test_parser ADD function testprs_start(internal,integer);
+ALTER EXTENSION test_parser ADD function testprs_getlexeme(internal,internal,internal);
+ALTER EXTENSION test_parser ADD function testprs_end(internal);
+ALTER EXTENSION test_parser ADD function testprs_lextype(internal);
+ALTER EXTENSION test_parser ADD text search parser testparser;
diff --git a/contrib/test_parser/test_parser.control b/contrib/test_parser/test_parser.control
new file mode 100644
index 0000000000..36b26b2087
--- /dev/null
+++ b/contrib/test_parser/test_parser.control
@@ -0,0 +1,5 @@
+# test_parser extension
+comment = 'example of a custom parser for full-text search'
+default_version = '1.0'
+module_pathname = '$libdir/test_parser'
+relocatable = true
diff --git a/contrib/test_parser/uninstall_test_parser.sql b/contrib/test_parser/uninstall_test_parser.sql
deleted file mode 100644
index 042f46b251..0000000000
--- a/contrib/test_parser/uninstall_test_parser.sql
+++ /dev/null
@@ -1,14 +0,0 @@
-/* contrib/test_parser/uninstall_test_parser.sql */
-
--- Adjust this setting to control where the objects get dropped.
-SET search_path = public;
-
-DROP TEXT SEARCH PARSER testparser;
-
-DROP FUNCTION testprs_start(internal, int4);
-
-DROP FUNCTION testprs_getlexeme(internal, internal, internal);
-
-DROP FUNCTION testprs_end(internal);
-
-DROP FUNCTION testprs_lextype(internal);