diff options
| author | Alvaro Herrera <alvherre@alvh.no-ip.org> | 2017-01-18 16:08:20 -0300 |
|---|---|---|
| committer | Alvaro Herrera <alvherre@alvh.no-ip.org> | 2017-01-18 16:08:20 -0300 |
| commit | 9a34123bc315e55b33038464422ef1cd2b67dab2 (patch) | |
| tree | 9b1e2e9189e7b60e7eb2876e365c5a950a6aa228 /src/backend/utils/adt/numeric.c | |
| parent | 716c7d4b242f0a64ad8ac4dc48c6fed6557ba12c (diff) | |
| download | postgresql-9a34123bc315e55b33038464422ef1cd2b67dab2.tar.gz postgresql-9a34123bc315e55b33038464422ef1cd2b67dab2.zip | |
Make messages mentioning type names more uniform
This avoids additional translatable strings for each distinct type, as
well as making our quoting style around type names more consistent
(namely, that we don't quote type names). This continues what started
as f402b9950120.
Discussion: https://postgr.es/m/20160401170642.GA57509@alvherre.pgsql
Diffstat (limited to 'src/backend/utils/adt/numeric.c')
| -rw-r--r-- | src/backend/utils/adt/numeric.c | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/src/backend/utils/adt/numeric.c b/src/backend/utils/adt/numeric.c index 5cc8de5af21..fa4e1b1e628 100644 --- a/src/backend/utils/adt/numeric.c +++ b/src/backend/utils/adt/numeric.c @@ -590,8 +590,8 @@ numeric_in(PG_FUNCTION_ARGS) if (!isspace((unsigned char) *cp)) ereport(ERROR, (errcode(ERRCODE_INVALID_TEXT_REPRESENTATION), - errmsg("invalid input syntax for type numeric: \"%s\"", - str))); + errmsg("invalid input syntax for type %s: \"%s\"", + "numeric", str))); cp++; } } @@ -617,8 +617,8 @@ numeric_in(PG_FUNCTION_ARGS) if (!isspace((unsigned char) *cp)) ereport(ERROR, (errcode(ERRCODE_INVALID_TEXT_REPRESENTATION), - errmsg("invalid input syntax for type numeric: \"%s\"", - str))); + errmsg("invalid input syntax for type %s: \"%s\"", + "numeric", str))); cp++; } @@ -5482,7 +5482,8 @@ set_var_from_str(const char *str, const char *cp, NumericVar *dest) if (!isdigit((unsigned char) *cp)) ereport(ERROR, (errcode(ERRCODE_INVALID_TEXT_REPRESENTATION), - errmsg("invalid input syntax for type numeric: \"%s\"", str))); + errmsg("invalid input syntax for type %s: \"%s\"", + "numeric", str))); decdigits = (unsigned char *) palloc(strlen(cp) + DEC_DIGITS * 2); @@ -5505,8 +5506,8 @@ set_var_from_str(const char *str, const char *cp, NumericVar *dest) if (have_dp) ereport(ERROR, (errcode(ERRCODE_INVALID_TEXT_REPRESENTATION), - errmsg("invalid input syntax for type numeric: \"%s\"", - str))); + errmsg("invalid input syntax for type %s: \"%s\"", + "numeric", str))); have_dp = TRUE; cp++; } @@ -5529,8 +5530,8 @@ set_var_from_str(const char *str, const char *cp, NumericVar *dest) if (endptr == cp) ereport(ERROR, (errcode(ERRCODE_INVALID_TEXT_REPRESENTATION), - errmsg("invalid input syntax for type numeric: \"%s\"", - str))); + errmsg("invalid input syntax for type %s: \"%s\"", + "numeric", str))); cp = endptr; /* @@ -6331,8 +6332,8 @@ numeric_to_double_no_overflow(Numeric num) /* shouldn't happen ... */ ereport(ERROR, (errcode(ERRCODE_INVALID_TEXT_REPRESENTATION), - errmsg("invalid input syntax for type double precision: \"%s\"", - tmp))); + errmsg("invalid input syntax for type %s: \"%s\"", + "double precision", tmp))); } pfree(tmp); @@ -6357,8 +6358,8 @@ numericvar_to_double_no_overflow(NumericVar *var) /* shouldn't happen ... */ ereport(ERROR, (errcode(ERRCODE_INVALID_TEXT_REPRESENTATION), - errmsg("invalid input syntax for type double precision: \"%s\"", - tmp))); + errmsg("invalid input syntax for type %s: \"%s\"", + "double precision", tmp))); } pfree(tmp); |