diff options
| author | Peter Eisentraut <peter_e@gmx.net> | 2015-11-16 21:16:42 -0500 |
|---|---|---|
| committer | Peter Eisentraut <peter_e@gmx.net> | 2015-11-16 21:16:42 -0500 |
| commit | 689cabf402c33a69e595a0d25f61b1fb49fb1c78 (patch) | |
| tree | 519966d4b2c4fa4b9cc495a041f18ccf2f484f39 /src/backend/utils/adt | |
| parent | 75c8af902e07a2090df429f410df1e753e3358f1 (diff) | |
| download | postgresql-689cabf402c33a69e595a0d25f61b1fb49fb1c78.tar.gz postgresql-689cabf402c33a69e595a0d25f61b1fb49fb1c78.zip | |
Message improvements
Diffstat (limited to 'src/backend/utils/adt')
| -rw-r--r-- | src/backend/utils/adt/array_userfuncs.c | 2 | ||||
| -rw-r--r-- | src/backend/utils/adt/encode.c | 4 | ||||
| -rw-r--r-- | src/backend/utils/adt/jsonb.c | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/backend/utils/adt/array_userfuncs.c b/src/backend/utils/adt/array_userfuncs.c index c14ea23dfbc..d0e0dfdae9e 100644 --- a/src/backend/utils/adt/array_userfuncs.c +++ b/src/backend/utils/adt/array_userfuncs.c @@ -746,7 +746,7 @@ array_position_common(FunctionCallInfo fcinfo) if (PG_ARGISNULL(2)) ereport(ERROR, (errcode(ERRCODE_NULL_VALUE_NOT_ALLOWED), - errmsg("initial position should not be NULL"))); + errmsg("initial position must not be null"))); position_min = PG_GETARG_INT32(2); } diff --git a/src/backend/utils/adt/encode.c b/src/backend/utils/adt/encode.c index 4b32b6cabbb..f4216fb7950 100644 --- a/src/backend/utils/adt/encode.c +++ b/src/backend/utils/adt/encode.c @@ -304,7 +304,7 @@ b64_decode(const char *src, unsigned len, char *dst) if (b < 0) ereport(ERROR, (errcode(ERRCODE_INVALID_PARAMETER_VALUE), - errmsg("invalid symbol '%c' while decoding base64 sequence", (int) c))); + errmsg("invalid symbol \"%c\" while decoding base64 sequence", (int) c))); } /* add it to buffer */ buf = (buf << 6) + b; @@ -325,7 +325,7 @@ b64_decode(const char *src, unsigned len, char *dst) ereport(ERROR, (errcode(ERRCODE_INVALID_PARAMETER_VALUE), errmsg("invalid base64 end sequence"), - errhint("Input data is missing padding, truncated, or otherwise corrupted."))); + errhint("Input data is missing padding, is truncated, or is otherwise corrupted."))); return p - dst; } diff --git a/src/backend/utils/adt/jsonb.c b/src/backend/utils/adt/jsonb.c index 7cbb69faf2e..0c14a3bfda4 100644 --- a/src/backend/utils/adt/jsonb.c +++ b/src/backend/utils/adt/jsonb.c @@ -1179,7 +1179,7 @@ jsonb_build_object(PG_FUNCTION_ARGS) if (nargs % 2 != 0) ereport(ERROR, (errcode(ERRCODE_INVALID_PARAMETER_VALUE), - errmsg("invalid number or arguments: object must be matched key value pairs"))); + errmsg("invalid number of arguments: object must be matched key value pairs"))); memset(&result, 0, sizeof(JsonbInState)); @@ -1193,7 +1193,7 @@ jsonb_build_object(PG_FUNCTION_ARGS) if (PG_ARGISNULL(i)) ereport(ERROR, (errcode(ERRCODE_INVALID_PARAMETER_VALUE), - errmsg("arg %d: key cannot be null", i + 1))); + errmsg("argument %d: key must not be null", i + 1))); val_type = get_fn_expr_argtype(fcinfo->flinfo, i); /* @@ -1215,7 +1215,7 @@ jsonb_build_object(PG_FUNCTION_ARGS) if (val_type == InvalidOid || val_type == UNKNOWNOID) ereport(ERROR, (errcode(ERRCODE_INVALID_PARAMETER_VALUE), - errmsg("arg %d: could not determine data type", i + 1))); + errmsg("argument %d: could not determine data type", i + 1))); add_jsonb(arg, false, &result, val_type, true); |