diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2022-01-03 14:05:03 -0500 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2022-01-03 14:05:03 -0500 |
| commit | 4b160492b9b8345747dfcad468eb89e9ccc0a876 (patch) | |
| tree | dddf14c63034af0210746472e5870058dcf9d205 /src/backend/utils/adt/date.c | |
| parent | ba2bc4a7bace6db6657b4e550b11137e31e2f8dc (diff) | |
Clean up error messages related to bad datetime units.
Adjust the error texts used for unrecognized/unsupported datetime
units so that there are just two strings to translate, not two
per datatype. Along the way, follow our usual error message style
of not double-quoting type names, and instead making sure that we
say the name is a type. Fix a couple of places in date.c that
were using the wrong one of "unrecognized" and "unsupported".
Nikhil Benesch, with a bit more editing by me
Discussion: https://postgr.es/m/CAPWqQZTURGixmbMH2_Z3ZtWGA0ANjUb9bwtkkxSxSfDeFHuM6Q@mail.gmail.com
Diffstat (limited to 'src/backend/utils/adt/date.c')
| -rw-r--r-- | src/backend/utils/adt/date.c | 36 |
1 files changed, 19 insertions, 17 deletions
diff --git a/src/backend/utils/adt/date.c b/src/backend/utils/adt/date.c index 9e8baeaa9c8..629166632db 100644 --- a/src/backend/utils/adt/date.c +++ b/src/backend/utils/adt/date.c @@ -22,6 +22,7 @@ #include <time.h> #include "access/xact.h" +#include "catalog/pg_type.h" #include "common/hashfn.h" #include "libpq/pqformat.h" #include "miscadmin.h" @@ -1124,8 +1125,8 @@ extract_date(PG_FUNCTION_ARGS) default: ereport(ERROR, (errcode(ERRCODE_FEATURE_NOT_SUPPORTED), - errmsg("date units \"%s\" not supported", - lowunits))); + errmsg("unit \"%s\" not supported for type %s", + lowunits, format_type_be(DATEOID)))); } } else if (type == UNITS) @@ -1207,8 +1208,8 @@ extract_date(PG_FUNCTION_ARGS) default: ereport(ERROR, (errcode(ERRCODE_FEATURE_NOT_SUPPORTED), - errmsg("date units \"%s\" not supported", - lowunits))); + errmsg("unit \"%s\" not supported for type %s", + lowunits, format_type_be(DATEOID)))); intresult = 0; } } @@ -1223,8 +1224,8 @@ extract_date(PG_FUNCTION_ARGS) default: ereport(ERROR, (errcode(ERRCODE_FEATURE_NOT_SUPPORTED), - errmsg("date units \"%s\" not supported", - lowunits))); + errmsg("unit \"%s\" not supported for type %s", + lowunits, format_type_be(DATEOID)))); intresult = 0; } } @@ -1232,7 +1233,8 @@ extract_date(PG_FUNCTION_ARGS) { ereport(ERROR, (errcode(ERRCODE_INVALID_PARAMETER_VALUE), - errmsg("date units \"%s\" not recognized", lowunits))); + errmsg("unit \"%s\" not recognized for type %s", + lowunits, format_type_be(DATEOID)))); intresult = 0; } @@ -2202,9 +2204,9 @@ time_part_common(PG_FUNCTION_ARGS, bool retnumeric) case DTK_ISOYEAR: default: ereport(ERROR, - (errcode(ERRCODE_INVALID_PARAMETER_VALUE), - errmsg("\"time\" units \"%s\" not recognized", - lowunits))); + (errcode(ERRCODE_FEATURE_NOT_SUPPORTED), + errmsg("unit \"%s\" not supported for type %s", + lowunits, format_type_be(TIMEOID)))); intresult = 0; } } @@ -2219,8 +2221,8 @@ time_part_common(PG_FUNCTION_ARGS, bool retnumeric) { ereport(ERROR, (errcode(ERRCODE_INVALID_PARAMETER_VALUE), - errmsg("\"time\" units \"%s\" not recognized", - lowunits))); + errmsg("unit \"%s\" not recognized for type %s", + lowunits, format_type_be(TIMEOID)))); intresult = 0; } @@ -2980,9 +2982,9 @@ timetz_part_common(PG_FUNCTION_ARGS, bool retnumeric) case DTK_MILLENNIUM: default: ereport(ERROR, - (errcode(ERRCODE_INVALID_PARAMETER_VALUE), - errmsg("\"time with time zone\" units \"%s\" not recognized", - lowunits))); + (errcode(ERRCODE_FEATURE_NOT_SUPPORTED), + errmsg("unit \"%s\" not supported for type %s", + lowunits, format_type_be(TIMETZOID)))); intresult = 0; } } @@ -3001,8 +3003,8 @@ timetz_part_common(PG_FUNCTION_ARGS, bool retnumeric) { ereport(ERROR, (errcode(ERRCODE_INVALID_PARAMETER_VALUE), - errmsg("\"time with time zone\" units \"%s\" not recognized", - lowunits))); + errmsg("unit \"%s\" not recognized for type %s", + lowunits, format_type_be(TIMETZOID)))); intresult = 0; } |