Commit8402fab

committed

file_fdw: Improve error message

The hint looked a bit confusing when there were no valid options tohint about.

1 parent4ad5cbe commit8402fabCopy full SHA for 8402fab

File tree

-5

lines changed

-5

lines changed

Lines changed: 4 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -230,8 +230,10 @@ file_fdw_validator(PG_FUNCTION_ARGS)`
`230`	`230`	`ereport(ERROR,`
`231`	`231`	`(errcode(ERRCODE_FDW_INVALID_OPTION_NAME),`
`232`	`232`	`errmsg("invalid option \"%s\"",def->defname),`
`233`		`-errhint("Valid options in this context are: %s",`
`234`		`-buf.data)));`
	`233`	`+buf.len>0`
	`234`	`+ ?errhint("Valid options in this context are: %s",`
	`235`	`+buf.data)`
	`236`	`+ :errhint("There are no valid options in this context.")));`
`235`	`237`	`}`
`236`	`238`
`237`	`239`	`/*`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -114,13 +114,13 @@ SELECT * FROM text_csv;`
`114`	`114`	`-- force_not_null is not allowed to be specified at any foreign object level:`
`115`	`115`	`ALTER FOREIGN DATA WRAPPER file_fdw OPTIONS (ADD force_not_null '*'); -- ERROR`
`116`	`116`	`ERROR: invalid option "force_not_null"`
`117`		`-HINT:Validoptions in this context are:`
	`117`	`+HINT:There are no validoptions in this context.`
`118`	`118`	`ALTER SERVER file_server OPTIONS (ADD force_not_null '*'); -- ERROR`
`119`	`119`	`ERROR: invalid option "force_not_null"`
`120`		`-HINT:Validoptions in this context are:`
	`120`	`+HINT:There are no validoptions in this context.`
`121`	`121`	`CREATE USER MAPPING FOR public SERVER file_server OPTIONS (force_not_null '*'); -- ERROR`
`122`	`122`	`ERROR: invalid option "force_not_null"`
`123`		`-HINT:Validoptions in this context are:`
	`123`	`+HINT:There are no validoptions in this context.`
`124`	`124`	`CREATE FOREIGN TABLE tbl () SERVER file_server OPTIONS (force_not_null '*'); -- ERROR`
`125`	`125`	`ERROR: invalid option "force_not_null"`
`126`	`126`	`HINT: Valid options in this context are: filename, format, header, delimiter, quote, escape, null, encoding`

Comments

(0)