From 1758b3ec96833922d2f788c8a125ba1724046cc6 Mon Sep 17 00:00:00 2001 From: Bruce Momjian Date: Thu, 8 Jun 2006 14:32:11 +0000 Subject: [PATCH] /contrib/adminpack: More clearly identify renaming of existing backend functions. I also found that pg_file_length was incorrectly documented in the README as pg_file_size. --- contrib/adminpack/README.adminpack | 9 +++++---- contrib/adminpack/adminpack.sql.in | 18 +++++++++--------- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/contrib/adminpack/README.adminpack b/contrib/adminpack/README.adminpack index 7694f408d1..1eb0ef5174 100644 --- a/contrib/adminpack/README.adminpack +++ b/contrib/adminpack/README.adminpack @@ -37,11 +37,12 @@ Objects implemented (superuser only) ==================================== int8 pg_catalog.pg_file_write(fname text, data text, append bool) -int8 pg_catalog.pg_file_read(fname text, data text, append bool) -bool pg_catalog.pg_file_rename(oldname text, newname text) bool pg_catalog.pg_file_rename(oldname text, newname text, archivname text) +bool pg_catalog.pg_file_rename(oldname text, newname text) bool pg_catalog.pg_file_unlink(fname text) -bigint pg_catalog.pg_file_size(text) -int4 pg_catalog.pg_logfile_rotate() setof record pg_catalog.pg_logdir_ls() +/* Renaming of existing backend functions for pgAdmin compatibility */ +int8 pg_catalog.pg_file_read(fname text, data text, append bool) +bigint pg_catalog.pg_file_length(text) +int4 pg_catalog.pg_logfile_rotate() diff --git a/contrib/adminpack/adminpack.sql.in b/contrib/adminpack/adminpack.sql.in index 1a3cc10bf8..fcd743595a 100644 --- a/contrib/adminpack/adminpack.sql.in +++ b/contrib/adminpack/adminpack.sql.in @@ -12,24 +12,20 @@ CREATE FUNCTION pg_catalog.pg_file_rename(text, text, text) RETURNS bool AS 'MODULE_PATHNAME', 'pg_file_rename' LANGUAGE C VOLATILE; -CREATE FUNCTION pg_catalog.pg_file_unlink(text) RETURNS bool - AS 'MODULE_PATHNAME', 'pg_file_unlink' - LANGUAGE C VOLATILE STRICT; - CREATE FUNCTION pg_catalog.pg_file_rename(text, text) RETURNS bool AS 'SELECT pg_file_rename($1, $2, NULL); ' LANGUAGE SQL VOLATILE STRICT; +CREATE FUNCTION pg_catalog.pg_file_unlink(text) RETURNS bool + AS 'MODULE_PATHNAME', 'pg_file_unlink' + LANGUAGE C VOLATILE STRICT; + CREATE FUNCTION pg_catalog.pg_logdir_ls() RETURNS setof record AS 'MODULE_PATHNAME', 'pg_logdir_ls' LANGUAGE C VOLATILE STRICT; -/* compatibility redefines */ - -CREATE FUNCTION pg_catalog.pg_logfile_rotate() RETURNS int4 - AS 'pg_rotate_logfile' - LANGUAGE INTERNAL VOLATILE STRICT; +/* Renaming of existing backend functions for pgAdmin compatibility */ CREATE FUNCTION pg_catalog.pg_file_read(text, bigint, bigint) RETURNS text AS 'pg_read_file' @@ -39,3 +35,7 @@ CREATE FUNCTION pg_catalog.pg_file_length(text) RETURNS bigint AS 'SELECT size FROM pg_stat_file($1)' LANGUAGE SQL VOLATILE STRICT; +CREATE FUNCTION pg_catalog.pg_logfile_rotate() RETURNS int4 + AS 'pg_rotate_logfile' + LANGUAGE INTERNAL VOLATILE STRICT; +