mirror of
https://github.com/postgres/postgres.git
synced 2025-06-26 12:21:12 +03:00
Fix a number of places that produced XX000 errors in the regression tests.
It's against project policy to use elog() for user-facing errors, or to omit an errcode() selection for errors that aren't supposed to be "can't happen" cases. Fix all the violations of this policy that result in ERRCODE_INTERNAL_ERROR log entries during the standard regression tests, as errors that can reliably be triggered from SQL surely should be considered user-facing. I also looked through all the files touched by this commit and fixed other nearby problems of the same ilk. I do not claim to have fixed all violations of the policy, just the ones in these files. In a few places I also changed existing ERRCODE choices that didn't seem particularly appropriate; mainly replacing ERRCODE_SYNTAX_ERROR by something more specific. Back-patch to 9.5, but no further; changing ERRCODE assignments in stable branches doesn't seem like a good idea.
This commit is contained in:
@ -631,7 +631,8 @@ ExecEvalScalarVar(ExprState *exprstate, ExprContext *econtext,
|
||||
{
|
||||
if (variable->vartype != attr->atttypid)
|
||||
ereport(ERROR,
|
||||
(errmsg("attribute %d has wrong type", attnum),
|
||||
(errcode(ERRCODE_DATATYPE_MISMATCH),
|
||||
errmsg("attribute %d has wrong type", attnum),
|
||||
errdetail("Table has type %s, but query expects %s.",
|
||||
format_type_be(attr->atttypid),
|
||||
format_type_be(variable->vartype))));
|
||||
@ -4111,7 +4112,8 @@ ExecEvalFieldSelect(FieldSelectState *fstate,
|
||||
/* As in ExecEvalScalarVar, we should but can't check typmod */
|
||||
if (fselect->resulttype != attr->atttypid)
|
||||
ereport(ERROR,
|
||||
(errmsg("attribute %d has wrong type", fieldnum),
|
||||
(errcode(ERRCODE_DATATYPE_MISMATCH),
|
||||
errmsg("attribute %d has wrong type", fieldnum),
|
||||
errdetail("Table has type %s, but query expects %s.",
|
||||
format_type_be(attr->atttypid),
|
||||
format_type_be(fselect->resulttype))));
|
||||
|
Reference in New Issue
Block a user