git.postgresql.org Git - postgresql.git/commitdiff

git projects / postgresql.git / commitdiff

Avoid splitting errmsg string to span multiple lines

author Amit Langote <amitlan@postgresql.org>

2024年3月22日 03:00:14 +0000 (12:00 +0900)

committer Amit Langote <amitlan@postgresql.org>

2024年3月22日 03:04:06 +0000 (12:04 +0900)

The error message being fixed was added in 6185c9737c.

While at it, add an "a" to the sentence.

Reported-by: Kyotaro Horiguchi <horikyota.ntt@gmail.com>
Discussion: https://postgr.es/m/20240322.095149.895185546948714852.horikyota.ntt%40gmail.com

src/backend/parser/parse_expr.c patch | blob | blame | history

src/test/regress/expected/sqljson_queryfuncs.out patch | blob | blame | history

diff --git a/src/backend/parser/parse_expr.c b/src/backend/parser/parse_expr.c

index 7166138bf768765dc32cabbfb4a685a6d8ceb557..73c83cea4ac509cb111ac80a6debf301d2952ba6 100644 (file)

--- a/src/backend/parser/parse_expr.c

+++ b/src/backend/parser/parse_expr.c

@@ -4586,9 +4586,7 @@ transformJsonBehavior(ParseState *pstate, JsonBehavior *behavior,

!IsA(expr, OpExpr))

ereport(ERROR,

(errcode(ERRCODE_DATATYPE_MISMATCH),

- errmsg("can only specify constant, non-aggregate"

- " function, or operator expression for"

- " DEFAULT"),

+ errmsg("can only specify a constant, non-aggregate function, or operator expression for DEFAULT"),

parser_errposition(pstate, exprLocation(expr))));

if (contain_var_clause(expr))

ereport(ERROR,

diff --git a/src/test/regress/expected/sqljson_queryfuncs.out b/src/test/regress/expected/sqljson_queryfuncs.out

index 5a537d06551181f41c9a52cfbaefcacf22ed34db..873cbac9606c985fc57221128d7cba3ee368d980 100644 (file)

--- a/src/test/regress/expected/sqljson_queryfuncs.out

+++ b/src/test/regress/expected/sqljson_queryfuncs.out

@@ -1203,11 +1203,11 @@ ERROR: DEFAULT expression must not contain column references

LINE 1: SELECT JSON_QUERY(js, '$' RETURNING int DEFAULT b + 1 ON ER...

SELECT JSON_QUERY(js, '$' RETURNING int DEFAULT sum(1) over() ON ERROR) FROM test_jsonb_mutability;

-ERROR: can only specify constant, non-aggregate function, or operator expression for DEFAULT

+ERROR: can only specify a constant, non-aggregate function, or operator expression for DEFAULT

LINE 1: SELECT JSON_QUERY(js, '$' RETURNING int DEFAULT sum(1) over...

SELECT JSON_QUERY(js, '$' RETURNING int DEFAULT (SELECT 1) ON ERROR) FROM test_jsonb_mutability;

-ERROR: can only specify constant, non-aggregate function, or operator expression for DEFAULT

+ERROR: can only specify a constant, non-aggregate function, or operator expression for DEFAULT

LINE 1: SELECT JSON_QUERY(js, '$' RETURNING int DEFAULT (SELECT 1) ...

DROP TABLE test_jsonb_mutability;

This is the main PostgreSQL git repository.

RSS Atom