diff options
| author | Tom Lane | 2011-02-14 01:06:41 +0000 |
|---|---|---|
| committer | Tom Lane | 2011-02-14 03:54:49 +0000 |
| commit | 629b3af27d5c2bc9d6e16b22b943ad651d4ecb56 (patch) | |
| tree | eae9ef9a69ae6ad7aacb2428e3cf15ec77873ac5 /contrib/adminpack | |
| parent | e693e97d754ed6812ea115170afeae4bf8797d3f (diff) | |
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
Diffstat (limited to 'contrib/adminpack')
| -rw-r--r-- | contrib/adminpack/.gitignore | 1 | ||||
| -rw-r--r-- | contrib/adminpack/Makefile | 7 | ||||
| -rw-r--r-- | contrib/adminpack/adminpack--1.0.sql (renamed from contrib/adminpack/adminpack.sql.in) | 2 | ||||
| -rw-r--r-- | contrib/adminpack/adminpack--unpackaged--1.0.sql | 10 | ||||
| -rw-r--r-- | contrib/adminpack/adminpack.control | 6 | ||||
| -rw-r--r-- | contrib/adminpack/uninstall_adminpack.sql | 10 |
6 files changed, 21 insertions, 15 deletions
diff --git a/contrib/adminpack/.gitignore b/contrib/adminpack/.gitignore deleted file mode 100644 index ea9a442f3a..0000000000 --- a/contrib/adminpack/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/adminpack.sql diff --git a/contrib/adminpack/Makefile b/contrib/adminpack/Makefile index d4413ad133..a127653d70 100644 --- a/contrib/adminpack/Makefile +++ b/contrib/adminpack/Makefile @@ -1,10 +1,11 @@ # contrib/adminpack/Makefile MODULE_big = adminpack -PG_CPPFLAGS = -I$(libpq_srcdir) -DATA_built = adminpack.sql -DATA = uninstall_adminpack.sql OBJS = adminpack.o +PG_CPPFLAGS = -I$(libpq_srcdir) + +EXTENSION = adminpack +DATA = adminpack--1.0.sql adminpack--unpackaged--1.0.sql ifdef USE_PGXS PG_CONFIG = pg_config diff --git a/contrib/adminpack/adminpack.sql.in b/contrib/adminpack/adminpack--1.0.sql index 6e389975d0..0502a4c01f 100644 --- a/contrib/adminpack/adminpack.sql.in +++ b/contrib/adminpack/adminpack--1.0.sql @@ -1,4 +1,4 @@ -/* contrib/adminpack/adminpack.sql.in */ +/* contrib/adminpack/adminpack--1.0.sql */ /* *********************************************** * Administrative functions for PostgreSQL diff --git a/contrib/adminpack/adminpack--unpackaged--1.0.sql b/contrib/adminpack/adminpack--unpackaged--1.0.sql new file mode 100644 index 0000000000..d1c6aade9c --- /dev/null +++ b/contrib/adminpack/adminpack--unpackaged--1.0.sql @@ -0,0 +1,10 @@ +/* contrib/adminpack/adminpack--unpackaged--1.0.sql */ + +ALTER EXTENSION adminpack ADD function pg_catalog.pg_file_write(text,text,boolean); +ALTER EXTENSION adminpack ADD function pg_catalog.pg_file_rename(text,text,text); +ALTER EXTENSION adminpack ADD function pg_catalog.pg_file_rename(text,text); +ALTER EXTENSION adminpack ADD function pg_catalog.pg_file_unlink(text); +ALTER EXTENSION adminpack ADD function pg_catalog.pg_logdir_ls(); +ALTER EXTENSION adminpack ADD function pg_catalog.pg_file_read(text,bigint,bigint); +ALTER EXTENSION adminpack ADD function pg_catalog.pg_file_length(text); +ALTER EXTENSION adminpack ADD function pg_catalog.pg_logfile_rotate(); diff --git a/contrib/adminpack/adminpack.control b/contrib/adminpack/adminpack.control new file mode 100644 index 0000000000..c79413f378 --- /dev/null +++ b/contrib/adminpack/adminpack.control @@ -0,0 +1,6 @@ +# adminpack extension +comment = 'administrative functions for PostgreSQL' +default_version = '1.0' +module_pathname = '$libdir/adminpack' +relocatable = false +schema = pg_catalog diff --git a/contrib/adminpack/uninstall_adminpack.sql b/contrib/adminpack/uninstall_adminpack.sql deleted file mode 100644 index 682cf67760..0000000000 --- a/contrib/adminpack/uninstall_adminpack.sql +++ /dev/null @@ -1,10 +0,0 @@ -/* contrib/adminpack/uninstall_adminpack.sql */ - -DROP FUNCTION pg_catalog.pg_file_write(text, text, bool) ; -DROP FUNCTION pg_catalog.pg_file_rename(text, text, text) ; -DROP FUNCTION pg_catalog.pg_file_rename(text, text) ; -DROP FUNCTION pg_catalog.pg_file_unlink(text) ; -DROP FUNCTION pg_catalog.pg_logdir_ls() ; -DROP FUNCTION pg_catalog.pg_file_read(text, bigint, bigint) ; -DROP FUNCTION pg_catalog.pg_file_length(text) ; -DROP FUNCTION pg_catalog.pg_logfile_rotate() ; |