From aa282d44464df0fbfa0672dc353d36734ec1092e Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Tue, 29 Apr 2003 22:13:11 +0000 Subject: Infrastructure for deducing Param types from context, in the same way that the types of untyped string-literal constants are deduced (ie, when coerce_type is applied to 'em, that's what the type must be). Remove the ancient hack of storing the input Param-types array as a global variable, and put the info into ParseState instead. This touches a lot of files because of adjustment of routine parameter lists, but it's really not a large patch. Note: PREPARE statement still insists on exact specification of parameter types, but that could easily be relaxed now, if we wanted to do so. --- src/backend/parser/parse_oper.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) (limited to 'src/backend/parser/parse_oper.c') diff --git a/src/backend/parser/parse_oper.c b/src/backend/parser/parse_oper.c index 3be29e64def..6238258ed2f 100644 --- a/src/backend/parser/parse_oper.c +++ b/src/backend/parser/parse_oper.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/parser/parse_oper.c,v 1.62 2003/04/08 23:20:02 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/parser/parse_oper.c,v 1.63 2003/04/29 22:13:10 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -1019,9 +1019,12 @@ unary_op_error(List *op, Oid arg, bool is_left_op) * * Transform operator expression ensuring type compatibility. * This is where some type conversion happens. + * + * As with coerce_type, pstate may be NULL if no special unknown-Param + * processing is wanted. */ Expr * -make_op(List *opname, Node *ltree, Node *rtree) +make_op(ParseState *pstate, List *opname, Node *ltree, Node *rtree) { Oid ltypeId, rtypeId; @@ -1052,7 +1055,7 @@ make_op(List *opname, Node *ltree, Node *rtree) } /* Do typecasting and build the expression tree */ - result = make_op_expr(tup, ltree, rtree, ltypeId, rtypeId); + result = make_op_expr(pstate, tup, ltree, rtree, ltypeId, rtypeId); ReleaseSysCache(tup); @@ -1063,9 +1066,13 @@ make_op(List *opname, Node *ltree, Node *rtree) /* * make_op_expr() * Build operator expression using an already-looked-up operator. + * + * As with coerce_type, pstate may be NULL if no special unknown-Param + * processing is wanted. */ Expr * -make_op_expr(Operator op, Node *ltree, Node *rtree, +make_op_expr(ParseState *pstate, Operator op, + Node *ltree, Node *rtree, Oid ltypeId, Oid rtypeId) { Form_pg_operator opform = (Form_pg_operator) GETSTRUCT(op); @@ -1114,7 +1121,7 @@ make_op_expr(Operator op, Node *ltree, Node *rtree, opform->oprresult); /* perform the necessary typecasting of arguments */ - make_fn_arguments(args, actual_arg_types, declared_arg_types); + make_fn_arguments(pstate, args, actual_arg_types, declared_arg_types); /* and build the expression node */ result = makeNode(OpExpr); -- cgit v1.2.3