database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-05-21 15:54:08 +03:00
Code

Improve error reporting in format()

Browse Source 
Clarify invalid format conversion type error message and add hint.

Author: Jim Nasby
This commit is contained in:
Teodor Sigaev 2016-02-11 18:11:11 +03:00
parent a455878d99
commit 07d25a964b
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/backend/utils/adt/varlena.c
View File

@ -4788,7 +4788,8 @@ text_reverse(PG_FUNCTION_ARGS)
if (++(ptr) >= (end_ptr)) \ if (++(ptr) >= (end_ptr)) \
ereport(ERROR, \ ereport(ERROR, \
(errcode(ERRCODE_INVALID_PARAMETER_VALUE), \ (errcode(ERRCODE_INVALID_PARAMETER_VALUE), \
errmsg("unterminated format specifier"))); \ errmsg("unterminated format() type specifier"), \
errhint("For a single \"%%\" use \"%%%%\"."))); \
} while (0) } while (0)
/* /*
@ -4920,8 +4921,9 @@ text_format(PG_FUNCTION_ARGS)
if (strchr("sIL", *cp) == NULL) if (strchr("sIL", *cp) == NULL)
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_INVALID_PARAMETER_VALUE), (errcode(ERRCODE_INVALID_PARAMETER_VALUE),
errmsg("unrecognized conversion type specifier \"%c\"", errmsg("unrecognized format() type specifier \"%c\"",
*cp))); *cp),
errhint("For a single \"%%\" use \"%%%%\".")));
/* If indirect width was specified, get its value */ /* If indirect width was specified, get its value */
if (widthpos >= 0) if (widthpos >= 0)
@ -4932,7 +4934,7 @@ text_format(PG_FUNCTION_ARGS)
if (arg >= nargs) if (arg >= nargs)
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_INVALID_PARAMETER_VALUE), (errcode(ERRCODE_INVALID_PARAMETER_VALUE),
errmsg("too few arguments for format"))); errmsg("too few arguments for format()")));
/* Get the value and type of the selected argument */ /* Get the value and type of the selected argument */
if (!funcvariadic) if (!funcvariadic)
@ -5040,8 +5042,9 @@ text_format(PG_FUNCTION_ARGS)
/* should not get here, because of previous check */ /* should not get here, because of previous check */
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_INVALID_PARAMETER_VALUE), (errcode(ERRCODE_INVALID_PARAMETER_VALUE),
errmsg("unrecognized conversion type specifier \"%c\"", errmsg("unrecognized format() type specifier \"%c\"",
*cp))); *cp),
errhint("For a single \"%%\" use \"%%%%\".")));
break; break;
} }
} }

9
src/test/regress/expected/text.out
View File

@ -211,7 +211,8 @@ ERROR: too few arguments for format
select format('Hello %s'); select format('Hello %s');
ERROR: too few arguments for format ERROR: too few arguments for format
select format('Hello %x', 20); select format('Hello %x', 20);
ERROR: unrecognized conversion type specifier "x" ERROR: unrecognized format() type specifier "x"
HINT: For a single "%" use "%%".
-- check literal and sql identifiers -- check literal and sql identifiers
select format('INSERT INTO %I VALUES(%L,%L)', 'mytab', 10, 'Hello'); select format('INSERT INTO %I VALUES(%L,%L)', 'mytab', 10, 'Hello');
format format
@ -263,9 +264,11 @@ ERROR: format specifies argument 0, but arguments are numbered from 1
select format('%*0$s', 'Hello'); select format('%*0$s', 'Hello');
ERROR: format specifies argument 0, but arguments are numbered from 1 ERROR: format specifies argument 0, but arguments are numbered from 1
select format('%1$', 1); select format('%1$', 1);
ERROR: unterminated format specifier ERROR: unterminated format() type specifier
HINT: For a single "%" use "%%".
select format('%1$1', 1); select format('%1$1', 1);
ERROR: unterminated format specifier ERROR: unterminated format() type specifier
HINT: For a single "%" use "%%".
-- check mix of positional and ordered placeholders -- check mix of positional and ordered placeholders
select format('Hello %s %1$s %s', 'World', 'Hello again'); select format('Hello %s %1$s %s', 'World', 'Hello again');
format format