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

Error message stylistic correction

Browse Source 
Fixup for commit ef5e60a9d3: The inconsistent use of articles was a
bit awkward.
This commit is contained in:
Peter Eisentraut
2025-11-04 11:59:17 +01:00
parent 861af92610
commit c09a06918d
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/backend/parser/parse_expr.c
View File

@@ -4772,7 +4772,7 @@ transformJsonBehavior(ParseState *pstate, JsonExpr *jsexpr,
targetcoll != exprcoll) targetcoll != exprcoll)
ereport(ERROR, ereport(ERROR,
errcode(ERRCODE_COLLATION_MISMATCH), errcode(ERRCODE_COLLATION_MISMATCH),
errmsg("the collation of DEFAULT expression conflicts with RETURNING clause"), errmsg("collation of DEFAULT expression conflicts with RETURNING clause"),
errdetail("\"%s\" versus \"%s\"", errdetail("\"%s\" versus \"%s\"",
get_collation_name(exprcoll), get_collation_name(exprcoll),
get_collation_name(targetcoll)), get_collation_name(targetcoll)),

8
src/test/regress/expected/collate.icu.utf8.out
View File

@@ -2711,12 +2711,12 @@ SELECT JSON_VALUE('{"a": "A"}', '$.a' RETURNING d1 DEFAULT 'C' ON EMPTY) = 'a';
(1 row) (1 row)
SELECT JSON_VALUE('{"a": "A"}', '$.a' RETURNING d1 DEFAULT 'C'::d2 ON EMPTY) = 'a'; -- error SELECT JSON_VALUE('{"a": "A"}', '$.a' RETURNING d1 DEFAULT 'C'::d2 ON EMPTY) = 'a'; -- error
ERROR: the collation of DEFAULT expression conflicts with RETURNING clause ERROR: collation of DEFAULT expression conflicts with RETURNING clause
LINE 1: ...ON_VALUE('{"a": "A"}', '$.a' RETURNING d1 DEFAULT 'C'::d2 ON... LINE 1: ...ON_VALUE('{"a": "A"}', '$.a' RETURNING d1 DEFAULT 'C'::d2 ON...
^ ^
DETAIL: "C" versus "case_insensitive" DETAIL: "C" versus "case_insensitive"
SELECT JSON_VALUE('{"a": "A"}', '$.a' RETURNING d1 DEFAULT 'C' COLLATE "C" ON EMPTY) = 'a'; -- error SELECT JSON_VALUE('{"a": "A"}', '$.a' RETURNING d1 DEFAULT 'C' COLLATE "C" ON EMPTY) = 'a'; -- error
ERROR: the collation of DEFAULT expression conflicts with RETURNING clause ERROR: collation of DEFAULT expression conflicts with RETURNING clause
LINE 1: ...ON_VALUE('{"a": "A"}', '$.a' RETURNING d1 DEFAULT 'C' COLLAT... LINE 1: ...ON_VALUE('{"a": "A"}', '$.a' RETURNING d1 DEFAULT 'C' COLLAT...
^ ^
DETAIL: "C" versus "case_insensitive" DETAIL: "C" versus "case_insensitive"
@@ -2733,12 +2733,12 @@ SELECT JSON_VALUE('{"a": "A"}', '$.c' RETURNING d1 DEFAULT 'A' COLLATE case_inse
(1 row) (1 row)
SELECT JSON_VALUE('{"a": "A"}', '$.c' RETURNING d1 DEFAULT 'A'::d2 ON EMPTY) = 'a'; -- error SELECT JSON_VALUE('{"a": "A"}', '$.c' RETURNING d1 DEFAULT 'A'::d2 ON EMPTY) = 'a'; -- error
ERROR: the collation of DEFAULT expression conflicts with RETURNING clause ERROR: collation of DEFAULT expression conflicts with RETURNING clause
LINE 1: ...ON_VALUE('{"a": "A"}', '$.c' RETURNING d1 DEFAULT 'A'::d2 ON... LINE 1: ...ON_VALUE('{"a": "A"}', '$.c' RETURNING d1 DEFAULT 'A'::d2 ON...
^ ^
DETAIL: "C" versus "case_insensitive" DETAIL: "C" versus "case_insensitive"
SELECT JSON_VALUE('{"a": "A"}', '$.c' RETURNING d1 DEFAULT 'A' COLLATE "C" ON EMPTY) = 'a'; -- error SELECT JSON_VALUE('{"a": "A"}', '$.c' RETURNING d1 DEFAULT 'A' COLLATE "C" ON EMPTY) = 'a'; -- error
ERROR: the collation of DEFAULT expression conflicts with RETURNING clause ERROR: collation of DEFAULT expression conflicts with RETURNING clause
LINE 1: ...ON_VALUE('{"a": "A"}', '$.c' RETURNING d1 DEFAULT 'A' COLLAT... LINE 1: ...ON_VALUE('{"a": "A"}', '$.c' RETURNING d1 DEFAULT 'A' COLLAT...
^ ^
DETAIL: "C" versus "case_insensitive" DETAIL: "C" versus "case_insensitive"