diff options
Diffstat (limited to 'src/backend/utils/adt')
| -rw-r--r-- | src/backend/utils/adt/jsonbsubs.c | 9 | ||||
| -rw-r--r-- | src/backend/utils/adt/multirangetypes.c | 14 |
2 files changed, 9 insertions, 14 deletions
diff --git a/src/backend/utils/adt/jsonbsubs.c b/src/backend/utils/adt/jsonbsubs.c index 47a89457dbe..0d160259d02 100644 --- a/src/backend/utils/adt/jsonbsubs.c +++ b/src/backend/utils/adt/jsonbsubs.c @@ -100,9 +100,8 @@ jsonb_subscript_transform(SubscriptingRef *sbsref, if (targetType != UNKNOWNOID) ereport(ERROR, (errcode(ERRCODE_DATATYPE_MISMATCH), - errmsg("subscript type is not supported"), - errhint("Jsonb subscript must be coerced " - "only to one type, integer or text."), + errmsg("subscript type %s is not supported", format_type_be(subExprType)), + errhint("jsonb subscript must be coercible to only one type, integer or text."), parser_errposition(pstate, exprLocation(subExpr)))); targetType = targets[i]; @@ -115,8 +114,8 @@ jsonb_subscript_transform(SubscriptingRef *sbsref, if (targetType == UNKNOWNOID) ereport(ERROR, (errcode(ERRCODE_DATATYPE_MISMATCH), - errmsg("subscript type is not supported"), - errhint("Jsonb subscript must be coerced to either integer or text"), + errmsg("subscript type %s is not supported", format_type_be(subExprType)), + errhint("jsonb subscript must be coercible to either integer or text."), parser_errposition(pstate, exprLocation(subExpr)))); } else diff --git a/src/backend/utils/adt/multirangetypes.c b/src/backend/utils/adt/multirangetypes.c index 7076a60c32d..77732155647 100644 --- a/src/backend/utils/adt/multirangetypes.c +++ b/src/backend/utils/adt/multirangetypes.c @@ -961,7 +961,7 @@ multirange_constructor2(PG_FUNCTION_ARGS) if (PG_ARGISNULL(0)) elog(ERROR, - "multirange values cannot contain NULL members"); + "multirange values cannot contain null members"); rangeArray = PG_GETARG_ARRAYTYPE_P(0); @@ -973,9 +973,7 @@ multirange_constructor2(PG_FUNCTION_ARGS) rngtypid = ARR_ELEMTYPE(rangeArray); if (rngtypid != rangetyp->type_id) - ereport(ERROR, - (errcode(ERRCODE_DATATYPE_MISMATCH), - errmsg("type %u does not match constructor type", rngtypid))); + elog(ERROR, "type %u does not match constructor type", rngtypid); /* * Be careful: we can still be called with zero ranges, like this: @@ -997,7 +995,7 @@ multirange_constructor2(PG_FUNCTION_ARGS) if (nulls[i]) ereport(ERROR, (errcode(ERRCODE_NULL_VALUE_NOT_ALLOWED), - errmsg("multirange values cannot contain NULL members"))); + errmsg("multirange values cannot contain null members"))); /* make_multirange will do its own copy */ ranges[i] = DatumGetRangeTypeP(elements[i]); @@ -1031,16 +1029,14 @@ multirange_constructor1(PG_FUNCTION_ARGS) if (PG_ARGISNULL(0)) elog(ERROR, - "multirange values cannot contain NULL members"); + "multirange values cannot contain null members"); range = PG_GETARG_RANGE_P(0); /* Make sure the range type matches. */ rngtypid = RangeTypeGetOid(range); if (rngtypid != rangetyp->type_id) - ereport(ERROR, - (errcode(ERRCODE_DATATYPE_MISMATCH), - errmsg("type %u does not match constructor type", rngtypid))); + elog(ERROR, "type %u does not match constructor type", rngtypid); PG_RETURN_MULTIRANGE_P(make_multirange(mltrngtypid, rangetyp, 1, &range)); } |