/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.

diff --git a/contrib/adminpack/README.adminpack b/contrib/adminpack/README.adminpack
index 7694f408d18b39db2232ac07c82b1cce469894f8..1eb0ef5174e20ec9a0e631c586b764f7b22aba5d 100644 (file)
--- 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 1a3cc10bf8859a89d23f71a5b0fb4d1218e1a179..fcd743595a428230a1fb7e8b17f91ba97bb829cd 100644 (file)
--- 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;
+