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

Commitdca2001

Browse files
committed
Unify some error messages
We had essentially the same error in several different wordings.Unify that.
1 parent1e7ca11 commitdca2001

File tree

4 files changed

+19
-19
lines changed

4 files changed

+19
-19
lines changed

‎src/backend/utils/adt/json.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1083,7 +1083,7 @@ json_object_agg_transfn_worker(FunctionCallInfo fcinfo,
10831083
if (!json_unique_check_key(&state->unique_check.check,key,0))
10841084
ereport(ERROR,
10851085
errcode(ERRCODE_DUPLICATE_JSON_OBJECT_KEY_VALUE),
1086-
errmsg("duplicate JSON key %s",key));
1086+
errmsg("duplicate JSONobjectkey value: %s",key));
10871087

10881088
if (skip)
10891089
PG_RETURN_POINTER(state);
@@ -1247,7 +1247,7 @@ json_build_object_worker(int nargs, Datum *args, bool *nulls, Oid *types,
12471247
if (!json_unique_check_key(&unique_check.check,key,0))
12481248
ereport(ERROR,
12491249
errcode(ERRCODE_DUPLICATE_JSON_OBJECT_KEY_VALUE),
1250-
errmsg("duplicate JSON key %s",key));
1250+
errmsg("duplicate JSONobjectkey value: %s",key));
12511251

12521252
if (skip)
12531253
continue;

‎src/backend/utils/adt/jsonb_util.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1955,7 +1955,7 @@ uniqueifyJsonbObject(JsonbValue *object, bool unique_keys, bool skip_nulls)
19551955
if (hasNonUniq&&unique_keys)
19561956
ereport(ERROR,
19571957
errcode(ERRCODE_DUPLICATE_JSON_OBJECT_KEY_VALUE),
1958-
errmsg("duplicate JSON object key"));
1958+
errmsg("duplicate JSON object key value"));
19591959

19601960
if (hasNonUniq||skip_nulls)
19611961
{

‎src/interfaces/ecpg/test/expected/sql-sqljson.stderr

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,11 @@
4242
[NO_PID]: sqlca: code: 0, state: 00000
4343
[NO_PID]: ecpg_execute on line 33: using PQexec
4444
[NO_PID]: sqlca: code: 0, state: 00000
45-
[NO_PID]: ecpg_check_PQresult on line 33: bad response - ERROR: duplicate JSON key "1"
45+
[NO_PID]: ecpg_check_PQresult on line 33: bad response - ERROR: duplicate JSONobjectkey value: "1"
4646
[NO_PID]: sqlca: code: 0, state: 00000
47-
[NO_PID]: raising sqlstate 22030 (sqlcode -400): duplicate JSON key "1" on line 33
47+
[NO_PID]: raising sqlstate 22030 (sqlcode -400): duplicate JSONobjectkey value: "1" on line 33
4848
[NO_PID]: sqlca: code: -400, state: 22030
49-
SQL error: duplicate JSON key "1" on line 33
49+
SQL error: duplicate JSONobjectkey value: "1" on line 33
5050
[NO_PID]: ecpg_execute on line 36: query: select json_object ( 1 : 1 , '2' : null , 1 : '2' absent on null without unique keys ); with 0 parameter(s) on connection ecpg1_regression
5151
[NO_PID]: sqlca: code: 0, state: 00000
5252
[NO_PID]: ecpg_execute on line 36: using PQexec

‎src/test/regress/expected/sqljson.out

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -544,25 +544,25 @@ SELECT JSON_OBJECT('a': '1', 'b': NULL, 'c': 2 ABSENT ON NULL);
544544
(1 row)
545545

546546
SELECT JSON_OBJECT(1: 1, '1': NULL WITH UNIQUE);
547-
ERROR: duplicate JSON key "1"
547+
ERROR: duplicate JSONobjectkey value: "1"
548548
SELECT JSON_OBJECT(1: 1, '1': NULL ABSENT ON NULL WITH UNIQUE);
549-
ERROR: duplicate JSON key "1"
549+
ERROR: duplicate JSONobjectkey value: "1"
550550
SELECT JSON_OBJECT(1: 1, '1': NULL NULL ON NULL WITH UNIQUE RETURNING jsonb);
551-
ERROR: duplicate JSON object key
551+
ERROR: duplicate JSON object key value
552552
SELECT JSON_OBJECT(1: 1, '1': NULL ABSENT ON NULL WITH UNIQUE RETURNING jsonb);
553-
ERROR: duplicate JSON object key
553+
ERROR: duplicate JSON object key value
554554
SELECT JSON_OBJECT(1: 1, '2': NULL, '1': 1 NULL ON NULL WITH UNIQUE);
555-
ERROR: duplicate JSON key "1"
555+
ERROR: duplicate JSONobjectkey value: "1"
556556
SELECT JSON_OBJECT(1: 1, '2': NULL, '1': 1 ABSENT ON NULL WITH UNIQUE);
557-
ERROR: duplicate JSON key "1"
557+
ERROR: duplicate JSONobjectkey value: "1"
558558
SELECT JSON_OBJECT(1: 1, '2': NULL, '1': 1 ABSENT ON NULL WITHOUT UNIQUE);
559559
json_object
560560
--------------------
561561
{"1" : 1, "1" : 1}
562562
(1 row)
563563

564564
SELECT JSON_OBJECT(1: 1, '2': NULL, '1': 1 ABSENT ON NULL WITH UNIQUE RETURNING jsonb);
565-
ERROR: duplicate JSON object key
565+
ERROR: duplicate JSON object key value
566566
SELECT JSON_OBJECT(1: 1, '2': NULL, '1': 1 ABSENT ON NULL WITHOUT UNIQUE RETURNING jsonb);
567567
json_object
568568
-------------
@@ -903,10 +903,10 @@ FROM
903903

904904
SELECT JSON_OBJECTAGG(k: v WITH UNIQUE KEYS)
905905
FROM (VALUES (1, 1), (1, NULL), (2, 2)) foo(k, v);
906-
ERROR: duplicate JSON key "1"
906+
ERROR: duplicate JSONobjectkey value: "1"
907907
SELECT JSON_OBJECTAGG(k: v ABSENT ON NULL WITH UNIQUE KEYS)
908908
FROM (VALUES (1, 1), (1, NULL), (2, 2)) foo(k, v);
909-
ERROR: duplicate JSON key "1"
909+
ERROR: duplicate JSONobjectkey value: "1"
910910
SELECT JSON_OBJECTAGG(k: v ABSENT ON NULL WITH UNIQUE KEYS)
911911
FROM (VALUES (1, 1), (0, NULL), (3, NULL), (2, 2), (4, NULL)) foo(k, v);
912912
json_objectagg
@@ -916,10 +916,10 @@ FROM (VALUES (1, 1), (0, NULL), (3, NULL), (2, 2), (4, NULL)) foo(k, v);
916916

917917
SELECT JSON_OBJECTAGG(k: v WITH UNIQUE KEYS RETURNING jsonb)
918918
FROM (VALUES (1, 1), (1, NULL), (2, 2)) foo(k, v);
919-
ERROR: duplicate JSON object key
919+
ERROR: duplicate JSON object key value
920920
SELECT JSON_OBJECTAGG(k: v ABSENT ON NULL WITH UNIQUE KEYS RETURNING jsonb)
921921
FROM (VALUES (1, 1), (1, NULL), (2, 2)) foo(k, v);
922-
ERROR: duplicate JSON object key
922+
ERROR: duplicate JSON object key value
923923
SELECT JSON_OBJECTAGG(k: v ABSENT ON NULL WITH UNIQUE KEYS RETURNING jsonb)
924924
FROM (VALUES (1, 1), (0, NULL),(4, null), (5, null),(6, null),(2, 2)) foo(k, v);
925925
json_objectagg
@@ -952,11 +952,11 @@ FROM (VALUES (1,1), (2,2)) a(k,v);
952952

953953
SELECT to_json(a) AS a, JSON_OBJECTAGG(k : v WITH UNIQUE KEYS) OVER (ORDER BY k)
954954
FROM (VALUES (1,1), (1,2), (2,2)) a(k,v);
955-
ERROR: duplicate JSON key "1"
955+
ERROR: duplicate JSONobjectkey value: "1"
956956
SELECT to_json(a) AS a, JSON_OBJECTAGG(k : v ABSENT ON NULL WITH UNIQUE KEYS)
957957
OVER (ORDER BY k)
958958
FROM (VALUES (1,1), (1,null), (2,2)) a(k,v);
959-
ERROR: duplicate JSON key "1"
959+
ERROR: duplicate JSONobjectkey value: "1"
960960
SELECT to_json(a) AS a, JSON_OBJECTAGG(k : v ABSENT ON NULL)
961961
OVER (ORDER BY k)
962962
FROM (VALUES (1,1), (1,null), (2,2)) a(k,v);

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp