database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-28 23:42:10 +03:00
Code Activity

file_fdw: Improve error message

Browse Source 
The hint looked a bit confusing when there were no valid options to
hint about.
This commit is contained in:
Peter Eisentraut
2012-05-17 20:20:33 +03:00
parent 4ad5cbedf6
commit 8402fab411
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
contrib/file_fdw/file_fdw.c
View File

@ -230,8 +230,10 @@ file_fdw_validator(PG_FUNCTION_ARGS)
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_FDW_INVALID_OPTION_NAME), (errcode(ERRCODE_FDW_INVALID_OPTION_NAME),
errmsg("invalid option \"%s\"", def->defname), errmsg("invalid option \"%s\"", def->defname),
errhint("Valid options in this context are: %s", buf.len > 0
buf.data))); ? errhint("Valid options in this context are: %s",
buf.data)
: errhint("There are no valid options in this context.")));
} }
/* /*

6
contrib/file_fdw/output/file_fdw.source
View File

@ -114,13 +114,13 @@ SELECT * FROM text_csv;
-- force_not_null is not allowed to be specified at any foreign object level: -- force_not_null is not allowed to be specified at any foreign object level:
ALTER FOREIGN DATA WRAPPER file_fdw OPTIONS (ADD force_not_null '*'); -- ERROR ALTER FOREIGN DATA WRAPPER file_fdw OPTIONS (ADD force_not_null '*'); -- ERROR
ERROR: invalid option "force_not_null" ERROR: invalid option "force_not_null"
HINT: Valid options in this context are: HINT: There are no valid options in this context.
ALTER SERVER file_server OPTIONS (ADD force_not_null '*'); -- ERROR ALTER SERVER file_server OPTIONS (ADD force_not_null '*'); -- ERROR
ERROR: invalid option "force_not_null" ERROR: invalid option "force_not_null"
HINT: Valid options in this context are: HINT: There are no valid options in this context.
CREATE USER MAPPING FOR public SERVER file_server OPTIONS (force_not_null '*'); -- ERROR CREATE USER MAPPING FOR public SERVER file_server OPTIONS (force_not_null '*'); -- ERROR
ERROR: invalid option "force_not_null" ERROR: invalid option "force_not_null"
HINT: Valid options in this context are: HINT: There are no valid options in this context.
CREATE FOREIGN TABLE tbl () SERVER file_server OPTIONS (force_not_null '*'); -- ERROR CREATE FOREIGN TABLE tbl () SERVER file_server OPTIONS (force_not_null '*'); -- ERROR
ERROR: invalid option "force_not_null" ERROR: invalid option "force_not_null"
HINT: Valid options in this context are: filename, format, header, delimiter, quote, escape, null, encoding HINT: Valid options in this context are: filename, format, header, delimiter, quote, escape, null, encoding