Commit8a56d4e

committed

Make format() error messages consistent again

07d25a9 changed only one occurrence. Change the other one as well.

1 parentbe7f7ee commit8a56d4eCopy full SHA for 8a56d4e

File tree

-5

lines changed

-5

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -5004,7 +5004,7 @@ text_format(PG_FUNCTION_ARGS)`
`5004`	`5004`	`if (arg >=nargs)`
`5005`	`5005`	`ereport(ERROR,`
`5006`	`5006`	`(errcode(ERRCODE_INVALID_PARAMETER_VALUE),`
`5007`		`-errmsg("too few arguments for format")));`
	`5007`	`+errmsg("too few arguments for format()")));`
`5008`	`5008`
`5009`	`5009`	`/* Get the value and type of the selected argument */`
`5010`	`5010`	`if (!funcvariadic)`

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -207,9 +207,9 @@ select format('Hello %%%%');`
`207`	`207`
`208`	`208`	`-- should fail`
`209`	`209`	`select format('Hello %s %s', 'World');`
`210`		`-ERROR: too few arguments for format`
	`210`	`+ERROR: too few arguments for format()`
`211`	`211`	`select format('Hello %s');`
`212`		`-ERROR: too few arguments for format`
	`212`	`+ERROR: too few arguments for format()`
`213`	`213`	`select format('Hello %x', 20);`
`214`	`214`	`ERROR: unrecognized format() type specifier "x"`
`215`	`215`	`HINT: For a single "%" use "%%".`
`@@ -256,9 +256,9 @@ select format('%1$s %12$s', 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12);`
`256`	`256`
`257`	`257`	`-- should fail`
`258`	`258`	`select format('%1$s %4$s', 1, 2, 3);`
`259`		`-ERROR: too few arguments for format`
	`259`	`+ERROR: too few arguments for format()`
`260`	`260`	`select format('%1$s %13$s', 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12);`
`261`		`-ERROR: too few arguments for format`
	`261`	`+ERROR: too few arguments for format()`
`262`	`262`	`select format('%0$s', 'Hello');`
`263`	`263`	`ERROR: format specifies argument 0, but arguments are numbered from 1`
`264`	`264`	`select format('%*0$s', 'Hello');`

Comments

(0)