database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-11-06 07:49:08 +03:00
Code Activity

Clean up error messages related to bad datetime units.

Browse Source 
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
This commit is contained in:
Tom Lane
2022-01-03 14:05:03 -05:00
parent ba2bc4a7ba
commit 4b160492b9
6 changed files with 76 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/backend/utils/adt/date.c
View File

@@ -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;
}