aboutsummaryrefslogtreecommitdiff
path: root/src/backend/executor/nodeFunctionscan.c
diff options
context:
space:
mode:
authorTom Lane <tgl@sss.pgh.pa.us>2003-07-21 17:05:12 +0000
committerTom Lane <tgl@sss.pgh.pa.us>2003-07-21 17:05:12 +0000
commit5e6d691e0daf18fcb5ae13e2252536df416668aa (patch)
tree2adf07e9e52286028ab21fba66fc478f995d58ee /src/backend/executor/nodeFunctionscan.c
parent82f18c4a2c7297f520051a50ee028d532a4b5ced (diff)
downloadpostgresql-5e6d691e0daf18fcb5ae13e2252536df416668aa.tar.gz
postgresql-5e6d691e0daf18fcb5ae13e2252536df416668aa.zip
Error message editing in backend/executor.
Diffstat (limited to 'src/backend/executor/nodeFunctionscan.c')
-rw-r--r--src/backend/executor/nodeFunctionscan.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/backend/executor/nodeFunctionscan.c b/src/backend/executor/nodeFunctionscan.c
index 282993ee4e9..36c43d7309a 100644
--- a/src/backend/executor/nodeFunctionscan.c
+++ b/src/backend/executor/nodeFunctionscan.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/executor/nodeFunctionscan.c,v 1.18 2003/06/15 17:59:10 tgl Exp $
+ * $Header: /cvsroot/pgsql/src/backend/executor/nodeFunctionscan.c,v 1.19 2003/07/21 17:05:09 tgl Exp $
*
*-------------------------------------------------------------------------
*/
@@ -88,7 +88,9 @@ FunctionNext(FunctionScanState *node)
*/
if (funcTupdesc &&
tupledesc_mismatch(node->tupdesc, funcTupdesc))
- elog(ERROR, "Query-specified return tuple and actual function return tuple do not match");
+ ereport(ERROR,
+ (errcode(ERRCODE_DATATYPE_MISMATCH),
+ errmsg("query-specified return tuple and actual function return tuple do not match")));
}
/*
@@ -201,7 +203,7 @@ ExecInitFunctionScan(FunctionScan *node, EState *estate)
funcrelid = typeidTypeRelid(funcrettype);
if (!OidIsValid(funcrelid))
- elog(ERROR, "Invalid typrelid for complex type %u",
+ elog(ERROR, "invalid typrelid for complex type %u",
funcrettype);
rel = relation_open(funcrelid, AccessShareLock);
tupdesc = CreateTupleDescCopy(RelationGetDescr(rel));