NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit0e5b144

committed

Fix error message wording

The originals are ambiguous and a bit out of style.Reviewed-by: Amit Langote <amitlangote09@gmail.com>Discussion:https://postgr.es/m/202412141243.efesjyyvzxsz@alvherre.pgsql

1 parentc4782c4 commit0e5b144Copy full SHA for 0e5b144

File tree

3 files changed

-6

lines changed

src
- backend/parser
  - parse_expr.c
- interfaces/ecpg/test/expected
  - sql-sqljson.stderr
- test/regress/expected
  - sqljson.out

3 files changed

-6

lines changed

`‎src/backend/parser/parse_expr.c`

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -4113,8 +4113,9 @@ transformJsonReturning(ParseState pstate, JsonOutput output, const char *fname`
`4113`	`4113`	`if (returning->typid!=JSONOID&&returning->typid!=JSONBOID)`
`4114`	`4114`	`ereport(ERROR,`
`4115`	`4115`	`(errcode(ERRCODE_DATATYPE_MISMATCH),`
`4116`		`-errmsg("cannot useRETURNINGtype %s in %s",`
	`4116`	`+errmsg("cannot use type %s in RETURNING clause of %s",`
`4117`	`4117`	`format_type_be(returning->typid),fname),`
	`4118`	`+errhint("Try returning json or jsonb."),`
`4118`	`4119`	`parser_errposition(pstate,output->typeName->location)));`
`4119`	`4120`	`}`
`4120`	`4121`	`else`
`@@ -4233,7 +4234,7 @@ transformJsonSerializeExpr(ParseState pstate, JsonSerializeExpr expr)`
`4233`	`4234`	`if (typcategory!=TYPCATEGORY_STRING)`
`4234`	`4235`	`ereport(ERROR,`
`4235`	`4236`	`(errcode(ERRCODE_DATATYPE_MISMATCH),`
`4236`		`-errmsg("cannot useRETURNINGtype %s in %s",`
	`4237`	`+errmsg("cannot use type %s in RETURNING clause of %s",`
`4237`	`4238`	`format_type_be(returning->typid),`
`4238`	`4239`	`"JSON_SERIALIZE()"),`
`4239`	`4240`	`errhint("Try returning a string type or bytea.")));`

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

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -240,12 +240,12 @@ SQL error: null value without indicator on line 84`
`240`	`240`	`[NO_PID]: sqlca: code: 0, state: 00000`
`241`	`241`	`[NO_PID]: ecpg_execute on line 99: using PQexec`
`242`	`242`	`[NO_PID]: sqlca: code: 0, state: 00000`
`243`		`-[NO_PID]: ecpg_check_PQresult on line 99: bad response - ERROR: cannot useRETURNINGtype jsonb in JSON_SERIALIZE()`
	`243`	`+[NO_PID]: ecpg_check_PQresult on line 99: bad response - ERROR: cannot use type jsonb in RETURNING clause of JSON_SERIALIZE()`
`244`	`244`	`HINT: Try returning a string type or bytea.`
`245`	`245`	`[NO_PID]: sqlca: code: 0, state: 00000`
`246`		`-[NO_PID]: raising sqlstate 42804 (sqlcode -400): cannot useRETURNINGtype jsonb in JSON_SERIALIZE() on line 99`
	`246`	`+[NO_PID]: raising sqlstate 42804 (sqlcode -400): cannot use type jsonb in RETURNING clause of JSON_SERIALIZE() on line 99`
`247`	`247`	`[NO_PID]: sqlca: code: -400, state: 42804`
`248`		`-SQL error: cannot useRETURNINGtype jsonb in JSON_SERIALIZE() on line 99`
	`248`	`+SQL error: cannot use type jsonb in RETURNING clause of JSON_SERIALIZE() on line 99`
`249`	`249`	`[NO_PID]: ecpg_execute on line 102: query: with val ( js ) as ( values ( '{ "a": 1, "b": [{ "a": 1, "b": 0, "a": 2 }] }' ) ) select js is json "IS JSON" , js is not json "IS NOT JSON" , js is json value "IS VALUE" , js is json object "IS OBJECT" , js is json array "IS ARRAY" , js is json scalar "IS SCALAR" , js is json without unique keys "WITHOUT UNIQUE" , js is json with unique keys "WITH UNIQUE" from val; with 0 parameter(s) on connection ecpg1_regression`
`250`	`250`	`[NO_PID]: sqlca: code: 0, state: 00000`
`251`	`251`	`[NO_PID]: ecpg_execute on line 102: using PQexec`

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

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -272,7 +272,7 @@ SELECT pg_typeof(JSON_SERIALIZE(NULL));`
`272`	`272`
`273`	`273`	`-- only string types or bytea allowed`
`274`	`274`	`SELECT JSON_SERIALIZE('{ "a" : 1 } ' RETURNING jsonb);`
`275`		`-ERROR: cannot useRETURNINGtype jsonb in JSON_SERIALIZE()`
	`275`	`+ERROR: cannot use type jsonb in RETURNING clause of JSON_SERIALIZE()`
`276`	`276`	`HINT: Try returning a string type or bytea.`
`277`	`277`	`EXPLAIN (VERBOSE, COSTS OFF) SELECT JSON_SERIALIZE('{}');`
`278`	`278`	`QUERY PLAN`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit0e5b144

File tree

3 files changed

3 files changed

`‎src/backend/parser/parse_expr.c`

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

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

0 commit comments