Skip to content

Commit 1baae82

Browse files
committed
Error message stylistic correction
Fixup for commit ef5e60a: The inconsistent use of articles was a bit awkward.
1 parent a142010 commit 1baae82

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

src/backend/parser/parse_expr.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4772,7 +4772,7 @@ transformJsonBehavior(ParseState *pstate, JsonExpr *jsexpr,
47724772
targetcoll != exprcoll)
47734773
ereport(ERROR,
47744774
errcode(ERRCODE_COLLATION_MISMATCH),
4775-
errmsg("the collation of DEFAULT expression conflicts with RETURNING clause"),
4775+
errmsg("collation of DEFAULT expression conflicts with RETURNING clause"),
47764776
errdetail("\"%s\" versus \"%s\"",
47774777
get_collation_name(exprcoll),
47784778
get_collation_name(targetcoll)),

src/test/regress/expected/collate.icu.utf8.out

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2707,12 +2707,12 @@ SELECT JSON_VALUE('{"a": "A"}', '$.a' RETURNING d1 DEFAULT 'C' ON EMPTY) = 'a';
27072707
(1 row)
27082708

27092709
SELECT JSON_VALUE('{"a": "A"}', '$.a' RETURNING d1 DEFAULT 'C'::d2 ON EMPTY) = 'a'; -- error
2710-
ERROR: the collation of DEFAULT expression conflicts with RETURNING clause
2710+
ERROR: collation of DEFAULT expression conflicts with RETURNING clause
27112711
LINE 1: ...ON_VALUE('{"a": "A"}', '$.a' RETURNING d1 DEFAULT 'C'::d2 ON...
27122712
^
27132713
DETAIL: "C" versus "case_insensitive"
27142714
SELECT JSON_VALUE('{"a": "A"}', '$.a' RETURNING d1 DEFAULT 'C' COLLATE "C" ON EMPTY) = 'a'; -- error
2715-
ERROR: the collation of DEFAULT expression conflicts with RETURNING clause
2715+
ERROR: collation of DEFAULT expression conflicts with RETURNING clause
27162716
LINE 1: ...ON_VALUE('{"a": "A"}', '$.a' RETURNING d1 DEFAULT 'C' COLLAT...
27172717
^
27182718
DETAIL: "C" versus "case_insensitive"
@@ -2729,12 +2729,12 @@ SELECT JSON_VALUE('{"a": "A"}', '$.c' RETURNING d1 DEFAULT 'A' COLLATE case_inse
27292729
(1 row)
27302730

27312731
SELECT JSON_VALUE('{"a": "A"}', '$.c' RETURNING d1 DEFAULT 'A'::d2 ON EMPTY) = 'a'; -- error
2732-
ERROR: the collation of DEFAULT expression conflicts with RETURNING clause
2732+
ERROR: collation of DEFAULT expression conflicts with RETURNING clause
27332733
LINE 1: ...ON_VALUE('{"a": "A"}', '$.c' RETURNING d1 DEFAULT 'A'::d2 ON...
27342734
^
27352735
DETAIL: "C" versus "case_insensitive"
27362736
SELECT JSON_VALUE('{"a": "A"}', '$.c' RETURNING d1 DEFAULT 'A' COLLATE "C" ON EMPTY) = 'a'; -- error
2737-
ERROR: the collation of DEFAULT expression conflicts with RETURNING clause
2737+
ERROR: collation of DEFAULT expression conflicts with RETURNING clause
27382738
LINE 1: ...ON_VALUE('{"a": "A"}', '$.c' RETURNING d1 DEFAULT 'A' COLLAT...
27392739
^
27402740
DETAIL: "C" versus "case_insensitive"

0 commit comments

Comments
 (0)