From cc09e6549f2bd2142b154d7d9802fb7a0abc643e Mon Sep 17 00:00:00 2001 From: Daniel Gustafsson Date: Mon, 4 Mar 2024 12:39:22 +0100 Subject: Remove the adminpack contrib extension The adminpack extension was only used to support pgAdmin III, which in turn was declared EOL many years ago. Removing the extension also allows us to remove functions from core as well which were only used to support old version of adminpack. Reviewed-by: Tom Lane Reviewed-by: Nathan Bossart Reviewed-by: Bharath Rupireddy Discussion: https://postgr.es/m/CALj2ACUmL5TraYBUBqDZBi1C+Re8_=SekqGYqYprj_W8wygQ8w@mail.gmail.com --- src/backend/utils/adt/genfile.c | 46 ----------------------------------------- 1 file changed, 46 deletions(-) (limited to 'src/backend/utils/adt/genfile.c') diff --git a/src/backend/utils/adt/genfile.c b/src/backend/utils/adt/genfile.c index ca19903ac6a..0d825574179 100644 --- a/src/backend/utils/adt/genfile.c +++ b/src/backend/utils/adt/genfile.c @@ -227,52 +227,6 @@ read_text_file(const char *filename, int64 seek_offset, int64 bytes_to_read, return NULL; } -/* - * Read a section of a file, returning it as text - * - * This function is kept to support adminpack 1.0. - */ -Datum -pg_read_file(PG_FUNCTION_ARGS) -{ - text *filename_t = PG_GETARG_TEXT_PP(0); - int64 seek_offset = 0; - int64 bytes_to_read = -1; - bool missing_ok = false; - char *filename; - text *result; - - if (!superuser()) - ereport(ERROR, - (errcode(ERRCODE_INSUFFICIENT_PRIVILEGE), - errmsg("must be superuser to read files with adminpack 1.0"), - /* translator: %s is a SQL function name */ - errhint("Consider using %s, which is part of core, instead.", - "pg_read_file()"))); - - /* handle optional arguments */ - if (PG_NARGS() >= 3) - { - seek_offset = PG_GETARG_INT64(1); - bytes_to_read = PG_GETARG_INT64(2); - - if (bytes_to_read < 0) - ereport(ERROR, - (errcode(ERRCODE_INVALID_PARAMETER_VALUE), - errmsg("requested length cannot be negative"))); - } - if (PG_NARGS() >= 4) - missing_ok = PG_GETARG_BOOL(3); - - filename = convert_and_check_filename(filename_t); - - result = read_text_file(filename, seek_offset, bytes_to_read, missing_ok); - if (result) - PG_RETURN_TEXT_P(result); - else - PG_RETURN_NULL(); -} - /* * Read a section of a file, returning it as text * -- cgit v1.2.3