From e0b15e27483ecbe911ea8681c18ceedf260920bf Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Tue, 13 Nov 2007 01:55:49 +0000 Subject: [PATCH] Fix insufficient search-path paranoia in SQL function definitions. Remove setting of search_path in install/uninstall scripts, since unlike other contrib modules this one does not want to let you change the installation schema. --- contrib/adminpack/adminpack.sql.in | 8 ++------ contrib/adminpack/uninstall_adminpack.sql | 3 --- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/contrib/adminpack/adminpack.sql.in b/contrib/adminpack/adminpack.sql.in index c2da5b11a0..9f6a915388 100644 --- a/contrib/adminpack/adminpack.sql.in +++ b/contrib/adminpack/adminpack.sql.in @@ -1,6 +1,3 @@ --- Adjust this setting to control where the objects get created. -SET search_path = public; - /* *********************************************** * Administrative functions for PostgreSQL * *********************************************** */ @@ -19,7 +16,7 @@ LANGUAGE C VOLATILE; CREATE OR REPLACE FUNCTION pg_catalog.pg_file_rename(text, text) RETURNS bool -AS 'SELECT pg_file_rename($1, $2, NULL); ' +AS 'SELECT pg_catalog.pg_file_rename($1, $2, NULL::pg_catalog.text);' LANGUAGE SQL VOLATILE STRICT; CREATE OR REPLACE FUNCTION pg_catalog.pg_file_unlink(text) @@ -42,11 +39,10 @@ LANGUAGE INTERNAL VOLATILE STRICT; CREATE OR REPLACE FUNCTION pg_catalog.pg_file_length(text) RETURNS bigint -AS 'SELECT size FROM pg_stat_file($1)' +AS 'SELECT size FROM pg_catalog.pg_stat_file($1)' LANGUAGE SQL VOLATILE STRICT; CREATE OR REPLACE FUNCTION pg_catalog.pg_logfile_rotate() RETURNS int4 AS 'pg_rotate_logfile' LANGUAGE INTERNAL VOLATILE STRICT; - diff --git a/contrib/adminpack/uninstall_adminpack.sql b/contrib/adminpack/uninstall_adminpack.sql index 03703a0ac4..b748cbbf63 100644 --- a/contrib/adminpack/uninstall_adminpack.sql +++ b/contrib/adminpack/uninstall_adminpack.sql @@ -1,6 +1,3 @@ --- Adjust this setting to control where the objects get dropped. -SET search_path = public; - 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) ; -- 2.40.0