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

6 files changed, 19 insertions, 26 deletions

diff --git a/contrib/pageinspect/.gitignore b/contrib/pageinspect/.gitignore
deleted file mode 100644
index fad166aaee8..00000000000
--- a/contrib/pageinspect/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/pageinspect.sql
diff --git a/contrib/pageinspect/Makefile b/contrib/pageinspect/Makefile
index a8ae51dfd1e..13ba6d39111 100644
--- a/contrib/pageinspect/Makefile
+++ b/contrib/pageinspect/Makefile
@@ -1,15 +1,10 @@
-#-------------------------------------------------------------------------
-#
-# pageinspect Makefile
-#
 # contrib/pageinspect/Makefile
-#
-#-------------------------------------------------------------------------
 
 MODULE_big	= pageinspect
 OBJS		= rawpage.o heapfuncs.o btreefuncs.o fsmfuncs.o
-DATA_built	= pageinspect.sql
-DATA      	= uninstall_pageinspect.sql
+
+EXTENSION = pageinspect
+DATA = pageinspect--1.0.sql pageinspect--unpackaged--1.0.sql
 
 ifdef USE_PGXS
 PG_CONFIG = pg_config
diff --git a/contrib/pageinspect/pageinspect.sql.in b/contrib/pageinspect/pageinspect--1.0.sql
index d6058d409f3..b6e46063ba2 100644
--- a/contrib/pageinspect/pageinspect.sql.in
+++ b/contrib/pageinspect/pageinspect--1.0.sql
@@ -1,7 +1,4 @@
-/* contrib/pageinspect/pageinspect.sql.in */
-
--- Adjust this setting to control where the objects get created.
-SET search_path = public;
+/* contrib/pageinspect/pageinspect--1.0.sql */
 
 --
 -- get_raw_page()
diff --git a/contrib/pageinspect/pageinspect--unpackaged--1.0.sql b/contrib/pageinspect/pageinspect--unpackaged--1.0.sql
new file mode 100644
index 00000000000..a9d1b52a426
--- /dev/null
+++ b/contrib/pageinspect/pageinspect--unpackaged--1.0.sql
@@ -0,0 +1,10 @@
+/* contrib/pageinspect/pageinspect--unpackaged--1.0.sql */
+
+ALTER EXTENSION pageinspect ADD function get_raw_page(text,integer);
+ALTER EXTENSION pageinspect ADD function get_raw_page(text,text,integer);
+ALTER EXTENSION pageinspect ADD function page_header(bytea);
+ALTER EXTENSION pageinspect ADD function heap_page_items(bytea);
+ALTER EXTENSION pageinspect ADD function bt_metap(text);
+ALTER EXTENSION pageinspect ADD function bt_page_stats(text,integer);
+ALTER EXTENSION pageinspect ADD function bt_page_items(text,integer);
+ALTER EXTENSION pageinspect ADD function fsm_page_contents(bytea);
diff --git a/contrib/pageinspect/pageinspect.control b/contrib/pageinspect/pageinspect.control
new file mode 100644
index 00000000000..f9da0e86edc
--- /dev/null
+++ b/contrib/pageinspect/pageinspect.control
@@ -0,0 +1,5 @@
+# pageinspect extension
+comment = 'inspect the contents of database pages at a low level'
+default_version = '1.0'
+module_pathname = '$libdir/pageinspect'
+relocatable = true
diff --git a/contrib/pageinspect/uninstall_pageinspect.sql b/contrib/pageinspect/uninstall_pageinspect.sql
deleted file mode 100644
index a980fd7d01e..00000000000
--- a/contrib/pageinspect/uninstall_pageinspect.sql
+++ /dev/null
@@ -1,13 +0,0 @@
-/* contrib/pageinspect/uninstall_pageinspect.sql */
-
--- Adjust this setting to control where the objects get dropped.
-SET search_path = public;
-
-DROP FUNCTION get_raw_page(text, int4);
-DROP FUNCTION get_raw_page(text, text, int4);
-DROP FUNCTION page_header(bytea);
-DROP FUNCTION heap_page_items(bytea);
-DROP FUNCTION bt_metap(text);
-DROP FUNCTION bt_page_stats(text, int4);
-DROP FUNCTION bt_page_items(text, int4);
-DROP FUNCTION fsm_page_contents(bytea);