Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commitc09a069

Browse files
committed
Error message stylistic correction
Fixup for commitef5e60a: The inconsistent use of articles was abit awkward.
1 parent861af92 commitc09a069

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("thecollation 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
@@ -2711,12 +2711,12 @@ SELECT JSON_VALUE('{"a": "A"}', '$.a' RETURNING d1 DEFAULT 'C' ON EMPTY) = 'a';
27112711
(1 row)
27122712

27132713
SELECT JSON_VALUE('{"a": "A"}', '$.a' RETURNING d1 DEFAULT 'C'::d2 ON EMPTY) = 'a'; -- error
2714-
ERROR:thecollation of DEFAULT expression conflicts with RETURNING clause
2714+
ERROR: collation of DEFAULT expression conflicts with RETURNING clause
27152715
LINE 1: ...ON_VALUE('{"a": "A"}', '$.a' RETURNING d1 DEFAULT 'C'::d2 ON...
27162716
^
27172717
DETAIL: "C" versus "case_insensitive"
27182718
SELECT JSON_VALUE('{"a": "A"}', '$.a' RETURNING d1 DEFAULT 'C' COLLATE "C" ON EMPTY) = 'a'; -- error
2719-
ERROR:thecollation of DEFAULT expression conflicts with RETURNING clause
2719+
ERROR: collation of DEFAULT expression conflicts with RETURNING clause
27202720
LINE 1: ...ON_VALUE('{"a": "A"}', '$.a' RETURNING d1 DEFAULT 'C' COLLAT...
27212721
^
27222722
DETAIL: "C" versus "case_insensitive"
@@ -2733,12 +2733,12 @@ SELECT JSON_VALUE('{"a": "A"}', '$.c' RETURNING d1 DEFAULT 'A' COLLATE case_inse
27332733
(1 row)
27342734

27352735
SELECT JSON_VALUE('{"a": "A"}', '$.c' RETURNING d1 DEFAULT 'A'::d2 ON EMPTY) = 'a'; -- error
2736-
ERROR:thecollation of DEFAULT expression conflicts with RETURNING clause
2736+
ERROR: collation of DEFAULT expression conflicts with RETURNING clause
27372737
LINE 1: ...ON_VALUE('{"a": "A"}', '$.c' RETURNING d1 DEFAULT 'A'::d2 ON...
27382738
^
27392739
DETAIL: "C" versus "case_insensitive"
27402740
SELECT JSON_VALUE('{"a": "A"}', '$.c' RETURNING d1 DEFAULT 'A' COLLATE "C" ON EMPTY) = 'a'; -- error
2741-
ERROR:thecollation of DEFAULT expression conflicts with RETURNING clause
2741+
ERROR: collation of DEFAULT expression conflicts with RETURNING clause
27422742
LINE 1: ...ON_VALUE('{"a": "A"}', '$.c' RETURNING d1 DEFAULT 'A' COLLAT...
27432743
^
27442744
DETAIL: "C" versus "case_insensitive"

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp