From: Peter Eisentraut Date: Mon, 15 Sep 2003 20:03:37 +0000 (+0000) Subject: OK, some of these syntax errors should be given other codes. X-Git-Url: http://waps.l3s.uni-hannover.de/gitweb/?a=commitdiff_plain;h=3f155730404830da8b6d72661176a45d000f1ddf;p=users%2Fbernd%2Fpostgres.git OK, some of these syntax errors should be given other codes. --- diff --git a/src/backend/executor/execQual.c b/src/backend/executor/execQual.c index f58d56a4ea..0ad43d6cb7 100644 --- a/src/backend/executor/execQual.c +++ b/src/backend/executor/execQual.c @@ -713,7 +713,7 @@ ExecMakeFunctionResult(FuncExprState *fcache, *isDone = ExprEndResult; else ereport(ERROR, - (errcode(ERRCODE_SYNTAX_ERROR), + (errcode(ERRCODE_FEATURE_NOT_SUPPORTED), errmsg("set-valued function called in context that cannot accept a set"))); return (Datum) 0; } @@ -757,7 +757,7 @@ ExecMakeFunctionResult(FuncExprState *fcache, */ if (isDone == NULL) ereport(ERROR, - (errcode(ERRCODE_SYNTAX_ERROR), + (errcode(ERRCODE_FEATURE_NOT_SUPPORTED), errmsg("set-valued function called in context that cannot accept a set"))); /* @@ -944,7 +944,7 @@ ExecMakeTableFunctionResult(ExprState *funcexpr, /* We don't allow sets in the arguments of the table function */ if (argDone != ExprSingleResult) ereport(ERROR, - (errcode(ERRCODE_SYNTAX_ERROR), + (errcode(ERRCODE_FEATURE_NOT_SUPPORTED), errmsg("set-valued function called in context that cannot accept a set"))); /* @@ -2955,7 +2955,7 @@ ExecTargetList(List *targetlist, /* We have a set-valued expression in the tlist */ if (isDone == NULL) ereport(ERROR, - (errcode(ERRCODE_SYNTAX_ERROR), + (errcode(ERRCODE_FEATURE_NOT_SUPPORTED), errmsg("set-valued function called in context that cannot accept a set"))); if (itemIsDone[resind] == ExprMultipleResult) { diff --git a/src/backend/executor/functions.c b/src/backend/executor/functions.c index c60bb0ebac..3eca61a4a3 100644 --- a/src/backend/executor/functions.c +++ b/src/backend/executor/functions.c @@ -574,7 +574,7 @@ fmgr_sql(PG_FUNCTION_ARGS) rsi->isDone = ExprEndResult; else ereport(ERROR, - (errcode(ERRCODE_SYNTAX_ERROR), + (errcode(ERRCODE_FEATURE_NOT_SUPPORTED), errmsg("set-valued function called in context that cannot accept a set"))); fcinfo->isnull = true; result = (Datum) 0; @@ -613,7 +613,7 @@ fmgr_sql(PG_FUNCTION_ARGS) rsi->isDone = ExprMultipleResult; else ereport(ERROR, - (errcode(ERRCODE_SYNTAX_ERROR), + (errcode(ERRCODE_FEATURE_NOT_SUPPORTED), errmsg("set-valued function called in context that cannot accept a set"))); /* diff --git a/src/backend/utils/adt/acl.c b/src/backend/utils/adt/acl.c index 1c1519834c..d4a4f97d9f 100644 --- a/src/backend/utils/adt/acl.c +++ b/src/backend/utils/adt/acl.c @@ -776,8 +776,8 @@ aclremove(PG_FUNCTION_ARGS) if (dst == 0) { /* start */ ereport(ERROR, - (errcode(ERRCODE_FEATURE_NOT_SUPPORTED), - errmsg("cannot remove the world ACL"))); + (errcode(ERRCODE_DATA_EXCEPTION), + errmsg("aclitem for public may not be removed"))); } else if (dst == old_num - 1) { /* end */ @@ -846,7 +846,7 @@ makeaclitem(PG_FUNCTION_ARGS) else if (u_grantee != 0 && g_grantee != 0) { ereport(ERROR, - (errcode(ERRCODE_SYNTAX_ERROR), + (errcode(ERRCODE_DATA_EXCEPTION), errmsg("cannot specify both user and group"))); } else if (u_grantee != 0) diff --git a/src/backend/utils/adt/array_userfuncs.c b/src/backend/utils/adt/array_userfuncs.c index 3d61629f8b..38104536c3 100644 --- a/src/backend/utils/adt/array_userfuncs.c +++ b/src/backend/utils/adt/array_userfuncs.c @@ -95,7 +95,7 @@ array_push(PG_FUNCTION_ARGS) indx = 1; else ereport(ERROR, - (errcode(ERRCODE_SYNTAX_ERROR), + (errcode(ERRCODE_DATA_EXCEPTION), errmsg("argument must be empty or one-dimensional array"))); /* diff --git a/src/backend/utils/adt/pgstatfuncs.c b/src/backend/utils/adt/pgstatfuncs.c index 240c36ea7c..440783764a 100644 --- a/src/backend/utils/adt/pgstatfuncs.c +++ b/src/backend/utils/adt/pgstatfuncs.c @@ -187,7 +187,7 @@ pg_stat_get_backend_idset(PG_FUNCTION_ARGS) if (fcinfo->resultinfo == NULL || !IsA(fcinfo->resultinfo, ReturnSetInfo)) ereport(ERROR, - (errcode(ERRCODE_SYNTAX_ERROR), + (errcode(ERRCODE_FEATURE_NOT_SUPPORTED), errmsg("set-valued function called in context that " "cannot accept a set"))); diff --git a/src/backend/utils/adt/ruleutils.c b/src/backend/utils/adt/ruleutils.c index 97cfa39174..2a3b7d0f34 100644 --- a/src/backend/utils/adt/ruleutils.c +++ b/src/backend/utils/adt/ruleutils.c @@ -1097,10 +1097,7 @@ pg_get_constraintdef_worker(Oid constraintId, int prettyFlags) break; } default: - ereport(ERROR, - (errcode(ERRCODE_INTERNAL_ERROR), - errmsg("invalid constraint type \"%c\"", - conForm->contype))); + elog(ERROR, "invalid constraint type \"%c\"", conForm->contype); break; } diff --git a/src/backend/utils/adt/sets.c b/src/backend/utils/adt/sets.c index e3171e5dac..7deb4b38fc 100644 --- a/src/backend/utils/adt/sets.c +++ b/src/backend/utils/adt/sets.c @@ -203,7 +203,7 @@ seteval(PG_FUNCTION_ARGS) rsi->isDone = isDone; else ereport(ERROR, - (errcode(ERRCODE_SYNTAX_ERROR), + (errcode(ERRCODE_FEATURE_NOT_SUPPORTED), errmsg("set-valued function called in context that " "cannot accept a set"))); } diff --git a/src/backend/utils/adt/varbit.c b/src/backend/utils/adt/varbit.c index 7b84b0010b..a199b46e64 100644 --- a/src/backend/utils/adt/varbit.c +++ b/src/backend/utils/adt/varbit.c @@ -901,7 +901,7 @@ bitand(PG_FUNCTION_ARGS) bitlen2 = VARBITLEN(arg2); if (bitlen1 != bitlen2) ereport(ERROR, - (errcode(ERRCODE_SYNTAX_ERROR), + (errcode(ERRCODE_STRING_DATA_LENGTH_MISMATCH), errmsg("cannot AND bit strings of different sizes"))); len = VARSIZE(arg1); @@ -942,7 +942,7 @@ bitor(PG_FUNCTION_ARGS) bitlen2 = VARBITLEN(arg2); if (bitlen1 != bitlen2) ereport(ERROR, - (errcode(ERRCODE_SYNTAX_ERROR), + (errcode(ERRCODE_STRING_DATA_LENGTH_MISMATCH), errmsg("cannot OR bit strings of different sizes"))); len = VARSIZE(arg1); result = (VarBit *) palloc(len); @@ -988,7 +988,7 @@ bitxor(PG_FUNCTION_ARGS) bitlen2 = VARBITLEN(arg2); if (bitlen1 != bitlen2) ereport(ERROR, - (errcode(ERRCODE_SYNTAX_ERROR), + (errcode(ERRCODE_STRING_DATA_LENGTH_MISMATCH), errmsg("cannot XOR bit strings of different sizes"))); len = VARSIZE(arg1); diff --git a/src/backend/utils/fmgr/funcapi.c b/src/backend/utils/fmgr/funcapi.c index 5d3cdbae00..bb4391f46b 100644 --- a/src/backend/utils/fmgr/funcapi.c +++ b/src/backend/utils/fmgr/funcapi.c @@ -34,7 +34,7 @@ init_MultiFuncCall(PG_FUNCTION_ARGS) */ if (fcinfo->resultinfo == NULL || !IsA(fcinfo->resultinfo, ReturnSetInfo)) ereport(ERROR, - (errcode(ERRCODE_SYNTAX_ERROR), + (errcode(ERRCODE_FEATURE_NOT_SUPPORTED), errmsg("set-valued function called in context that cannot accept a set"))); if (fcinfo->flinfo->fn_extra == NULL)