From e47d6f95b9713671fa5f5e7452561034fec81284 Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Fri, 8 Dec 2000 00:03:02 +0000 Subject: [PATCH] Improve error message for erroneous use of 'opaque' as plpgsql argument or return type. --- src/pl/plpgsql/src/pl_comp.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/src/pl/plpgsql/src/pl_comp.c b/src/pl/plpgsql/src/pl_comp.c index d29bb16d84..5f65604d76 100644 --- a/src/pl/plpgsql/src/pl_comp.c +++ b/src/pl/plpgsql/src/pl_comp.c @@ -181,8 +181,12 @@ plpgsql_compile(Oid fn_oid, int functype) if (!HeapTupleIsValid(typeTup)) { plpgsql_comperrinfo(); - elog(ERROR, "cache lookup for return type %u failed", - procStruct->prorettype); + if (!OidIsValid(procStruct->prorettype)) + elog(ERROR, "plpgsql functions cannot return type \"opaque\"" + "\n\texcept when used as triggers"); + else + elog(ERROR, "cache lookup for return type %u failed", + procStruct->prorettype); } typeStruct = (Form_pg_type) GETSTRUCT(typeTup); if (typeStruct->typrelid != InvalidOid) @@ -214,8 +218,11 @@ plpgsql_compile(Oid fn_oid, int functype) if (!HeapTupleIsValid(typeTup)) { plpgsql_comperrinfo(); - elog(ERROR, "cache lookup for argument type %u failed", - procStruct->proargtypes[i]); + if (!OidIsValid(procStruct->proargtypes[i])) + elog(ERROR, "plpgsql functions cannot take type \"opaque\""); + else + elog(ERROR, "cache lookup for argument type %u failed", + procStruct->proargtypes[i]); } typeStruct = (Form_pg_type) GETSTRUCT(typeTup); @@ -232,7 +239,8 @@ plpgsql_compile(Oid fn_oid, int functype) if (plpgsql_parse_wordrowtype(buf) != T_ROW) { plpgsql_comperrinfo(); - elog(ERROR, "cannot get tuple struct of argument %d", i + 1); + elog(ERROR, "cannot get tuple struct of argument %d", + i + 1); } row = plpgsql_yylval.row; -- 2.39.5