diff options
Diffstat (limited to 'src/backend/parser')
| -rw-r--r-- | src/backend/parser/parse_coerce.c | 10 | ||||
| -rw-r--r-- | src/backend/parser/parse_expr.c | 3 |
2 files changed, 3 insertions, 10 deletions
diff --git a/src/backend/parser/parse_coerce.c b/src/backend/parser/parse_coerce.c index e6559086286..2809a9a17f1 100644 --- a/src/backend/parser/parse_coerce.c +++ b/src/backend/parser/parse_coerce.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/parser/parse_coerce.c,v 2.87 2002/11/25 21:29:41 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/parser/parse_coerce.c,v 2.88 2002/11/26 03:01:58 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -241,14 +241,8 @@ coerce_type(Node *node, Oid inputTypeId, Oid targetTypeId, * * Note that no folding will occur if the conversion function is * not marked 'immutable'. - * - * HACK: if constant is NULL, don't fold it here. This is needed - * by make_subplan(), which calls this routine on placeholder - * Const nodes that mustn't be collapsed. (It'd be a lot - * cleaner to make a separate node type for that purpose...) */ - if (IsA(node, Const) && - !((Const *) node)->constisnull) + if (IsA(node, Const)) result = eval_const_expressions(result); } else diff --git a/src/backend/parser/parse_expr.c b/src/backend/parser/parse_expr.c index 9a4a9c8bc91..fd2cd4f34b3 100644 --- a/src/backend/parser/parse_expr.c +++ b/src/backend/parser/parse_expr.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/parser/parse_expr.c,v 1.130 2002/11/15 02:50:09 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/parser/parse_expr.c,v 1.131 2002/11/26 03:01:58 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -122,7 +122,6 @@ transformExpr(ParseState *pstate, Node *expr, ConstraintTestValue *domVal) param = makeNode(Param); param->paramkind = PARAM_NUM; param->paramid = (AttrNumber) paramno; - param->paramname = "<unnamed>"; param->paramtype = paramtyp; result = (Node *) param; /* handle qualification, if any */ |