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

Commitc672262

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

File tree

4 files changed

+17
-17
lines changed

4 files changed

+17
-17
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1186,7 +1186,7 @@ json_object_agg_transfn_worker(FunctionCallInfo fcinfo,
11861186
if (!json_unique_check_key(&state->unique_check.check,key,0))
11871187
ereport(ERROR,
11881188
errcode(ERRCODE_DUPLICATE_JSON_OBJECT_KEY_VALUE),
1189-
errmsg("duplicate JSON key %s",key));
1189+
errmsg("duplicate JSONobjectkey value: %s",key));
11901190

11911191
if (skip)
11921192
PG_RETURN_POINTER(state);
@@ -1349,7 +1349,7 @@ json_build_object_worker(int nargs, Datum *args, bool *nulls, Oid *types,
13491349
if (!json_unique_check_key(&unique_check.check,key,0))
13501350
ereport(ERROR,
13511351
errcode(ERRCODE_DUPLICATE_JSON_OBJECT_KEY_VALUE),
1352-
errmsg("duplicate JSON key %s",key));
1352+
errmsg("duplicate JSONobjectkey value: %s",key));
13531353

13541354
if (skip)
13551355
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: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -254,25 +254,25 @@ SELECT JSON_OBJECT('a': '1', 'b': NULL, 'c': 2 ABSENT ON NULL);
254254
(1 row)
255255

256256
SELECT JSON_OBJECT(1: 1, '1': NULL WITH UNIQUE);
257-
ERROR: duplicate JSON key "1"
257+
ERROR: duplicate JSONobjectkey value: "1"
258258
SELECT JSON_OBJECT(1: 1, '1': NULL ABSENT ON NULL WITH UNIQUE);
259-
ERROR: duplicate JSON key "1"
259+
ERROR: duplicate JSONobjectkey value: "1"
260260
SELECT JSON_OBJECT(1: 1, '1': NULL NULL ON NULL WITH UNIQUE RETURNING jsonb);
261-
ERROR: duplicate JSON object key
261+
ERROR: duplicate JSON object key value
262262
SELECT JSON_OBJECT(1: 1, '1': NULL ABSENT ON NULL WITH UNIQUE RETURNING jsonb);
263-
ERROR: duplicate JSON object key
263+
ERROR: duplicate JSON object key value
264264
SELECT JSON_OBJECT(1: 1, '2': NULL, '1': 1 NULL ON NULL WITH UNIQUE);
265-
ERROR: duplicate JSON key "1"
265+
ERROR: duplicate JSONobjectkey value: "1"
266266
SELECT JSON_OBJECT(1: 1, '2': NULL, '1': 1 ABSENT ON NULL WITH UNIQUE);
267-
ERROR: duplicate JSON key "1"
267+
ERROR: duplicate JSONobjectkey value: "1"
268268
SELECT JSON_OBJECT(1: 1, '2': NULL, '1': 1 ABSENT ON NULL WITHOUT UNIQUE);
269269
json_object
270270
--------------------
271271
{"1" : 1, "1" : 1}
272272
(1 row)
273273

274274
SELECT JSON_OBJECT(1: 1, '2': NULL, '1': 1 ABSENT ON NULL WITH UNIQUE RETURNING jsonb);
275-
ERROR: duplicate JSON object key
275+
ERROR: duplicate JSON object key value
276276
SELECT JSON_OBJECT(1: 1, '2': NULL, '1': 1 ABSENT ON NULL WITHOUT UNIQUE RETURNING jsonb);
277277
json_object
278278
-------------
@@ -613,10 +613,10 @@ FROM
613613

614614
SELECT JSON_OBJECTAGG(k: v WITH UNIQUE KEYS)
615615
FROM (VALUES (1, 1), (1, NULL), (2, 2)) foo(k, v);
616-
ERROR: duplicate JSON key "1"
616+
ERROR: duplicate JSONobjectkey value: "1"
617617
SELECT JSON_OBJECTAGG(k: v ABSENT ON NULL WITH UNIQUE KEYS)
618618
FROM (VALUES (1, 1), (1, NULL), (2, 2)) foo(k, v);
619-
ERROR: duplicate JSON key "1"
619+
ERROR: duplicate JSONobjectkey value: "1"
620620
SELECT JSON_OBJECTAGG(k: v ABSENT ON NULL WITH UNIQUE KEYS)
621621
FROM (VALUES (1, 1), (0, NULL), (3, NULL), (2, 2), (4, NULL)) foo(k, v);
622622
json_objectagg
@@ -626,10 +626,10 @@ FROM (VALUES (1, 1), (0, NULL), (3, NULL), (2, 2), (4, NULL)) foo(k, v);
626626

627627
SELECT JSON_OBJECTAGG(k: v WITH UNIQUE KEYS RETURNING jsonb)
628628
FROM (VALUES (1, 1), (1, NULL), (2, 2)) foo(k, v);
629-
ERROR: duplicate JSON object key
629+
ERROR: duplicate JSON object key value
630630
SELECT JSON_OBJECTAGG(k: v ABSENT ON NULL WITH UNIQUE KEYS RETURNING jsonb)
631631
FROM (VALUES (1, 1), (1, NULL), (2, 2)) foo(k, v);
632-
ERROR: duplicate JSON object key
632+
ERROR: duplicate JSON object key value
633633
-- Test JSON_OBJECT deparsing
634634
EXPLAIN (VERBOSE, COSTS OFF)
635635
SELECT JSON_OBJECT('foo' : '1' FORMAT JSON, 'bar' : 'baz' RETURNING json);

0 commit comments

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