|
8 | 8 | * |
9 | 9 | * |
10 | 10 | * IDENTIFICATION |
11 | | - * $Header: /cvsroot/pgsql/src/backend/parser/parse_coerce.c,v 2.36 2000/03/16 06:35:07 tgl Exp $ |
| 11 | + * $Header: /cvsroot/pgsql/src/backend/parser/parse_coerce.c,v 2.37 2000/03/19 00:15:39 tgl Exp $ |
12 | 12 | * |
13 | 13 | *------------------------------------------------------------------------- |
14 | 14 | */ |
15 | 15 | #include"postgres.h" |
16 | 16 |
|
17 | | - |
| 17 | +#include"catalog/pg_proc.h" |
18 | 18 | #include"optimizer/clauses.h" |
19 | 19 | #include"parser/parse_coerce.h" |
20 | 20 | #include"parser/parse_expr.h" |
@@ -126,6 +126,12 @@ coerce_type(ParseState *pstate, Node *node, Oid inputTypeId, |
126 | 126 |
|
127 | 127 | result=transformExpr(pstate, (Node*)n,EXPR_COLUMN_FIRST); |
128 | 128 |
|
| 129 | +/* safety check that we got the right thing */ |
| 130 | +if (exprType(result)!=targetTypeId) |
| 131 | +elog(ERROR,"coerce_type: conversion function %s produced %s", |
| 132 | +typeTypeName(targetType), |
| 133 | +typeidTypeName(exprType(result))); |
| 134 | + |
129 | 135 | /* |
130 | 136 | * If the input is a constant, apply the type conversion function |
131 | 137 | * now instead of delaying to runtime. (We could, of course, |
@@ -163,6 +169,7 @@ can_coerce_type(int nargs, Oid *input_typeids, Oid *func_typeids) |
163 | 169 | { |
164 | 170 | inti; |
165 | 171 | HeapTupleftup; |
| 172 | +Form_pg_procpform; |
166 | 173 | Oidoid_array[FUNC_MAX_ARGS]; |
167 | 174 |
|
168 | 175 | /* run through argument list... */ |
@@ -221,9 +228,10 @@ can_coerce_type(int nargs, Oid *input_typeids, Oid *func_typeids) |
221 | 228 | 0); |
222 | 229 | if (!HeapTupleIsValid(ftup)) |
223 | 230 | return false; |
224 | | -/* |
225 | | - * should also check the function return type just to be safe... |
226 | | - */ |
| 231 | +/* Make sure the function's result type is as expected, too */ |
| 232 | +pform= (Form_pg_proc)GETSTRUCT(ftup); |
| 233 | +if (pform->prorettype!=targetTypeId) |
| 234 | +return false; |
227 | 235 | } |
228 | 236 |
|
229 | 237 | return true; |
|