database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-17 06:41:09 +03:00
Code Activity

libpq: Improve error message when parsing URI parameters and keywords

Browse Source 
The error message showing up when parameters or keywords include too
many whitespaces was "trailing data found", which was confusing because
there was no hint about what was actually wrong.

Issue introduced in 430ce189fc, hence there is no need for a
backpatch.

Author: Yushi Ogiwara
Reviewed-by: Fujii Masao, Tom Lane, Bruce Momjian
Discussion: https://postgr.es/m/645bd22a53c4da8a1bc7e1e52d9d3b52@oss.nttdata.com
This commit is contained in:
Michael Paquier
2024-11-19 13:27:42 +09:00
parent b38bac26e2
commit a3699daea2
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/interfaces/libpq/fe-connect.c
View File

@ -6825,7 +6825,9 @@ end:
/* Not at the end of the string yet? Fail. */ /* Not at the end of the string yet? Fail. */
if (*q != '\0') if (*q != '\0')
{ {
libpq_append_error(errorMessage, "trailing data found: \"%s\"", str); libpq_append_error(errorMessage,
"unexpected spaces found in \"%s\", use percent-encoded spaces (%%20) instead",
str);
free(buf); free(buf);
return NULL; return NULL;
} }

4
src/interfaces/libpq/t/001_uri.pl
View File

@ -96,13 +96,13 @@ my @tests = (
# Trailing data in parameter. # Trailing data in parameter.
q{postgresql://host? user user = uri & port = 12345 12 }, q{postgresql://host? user user = uri & port = 12345 12 },
q{}, q{},
q{libpq_uri_regress: trailing data found: " user user "}, q{libpq_uri_regress: unexpected spaces found in " user user ", use percent-encoded spaces (%20) instead},
], ],
[ [
# Trailing data in value. # Trailing data in value.
q{postgresql://host? user = uri-user & port = 12345 12 }, q{postgresql://host? user = uri-user & port = 12345 12 },
q{}, q{},
q{libpq_uri_regress: trailing data found: " 12345 12 "}, q{libpq_uri_regress: unexpected spaces found in " 12345 12 ", use percent-encoded spaces (%20) instead},
], ],
[ q{postgresql://host?}, q{host='host' (inet)}, q{}, ], [ q{postgresql://host?}, q{host='host' (inet)}, q{}, ],
[ [