diff options
Diffstat (limited to 'src/backend')
| -rw-r--r-- | src/backend/executor/execQual.c | 13 | ||||
| -rw-r--r-- | src/backend/utils/adt/xml.c | 7 |
2 files changed, 3 insertions, 17 deletions
diff --git a/src/backend/executor/execQual.c b/src/backend/executor/execQual.c index b831aa530fa..d9cbb1d763a 100644 --- a/src/backend/executor/execQual.c +++ b/src/backend/executor/execQual.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/executor/execQual.c,v 1.245 2009/04/05 20:32:06 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/executor/execQual.c,v 1.246 2009/04/08 21:51:38 petere Exp $ * *------------------------------------------------------------------------- */ @@ -4671,27 +4671,16 @@ ExecInitExpr(Expr *node, PlanState *parent) XmlExprState *xstate = makeNode(XmlExprState); List *outlist; ListCell *arg; - int i; xstate->xprstate.evalfunc = (ExprStateEvalFunc) ExecEvalXml; - xstate->named_outfuncs = (FmgrInfo *) - palloc0(list_length(xexpr->named_args) * sizeof(FmgrInfo)); outlist = NIL; - i = 0; foreach(arg, xexpr->named_args) { Expr *e = (Expr *) lfirst(arg); ExprState *estate; - Oid typOutFunc; - bool typIsVarlena; estate = ExecInitExpr(e, parent); outlist = lappend(outlist, estate); - - getTypeOutputInfo(exprType((Node *) e), - &typOutFunc, &typIsVarlena); - fmgr_info(typOutFunc, &xstate->named_outfuncs[i]); - i++; } xstate->named_args = outlist; diff --git a/src/backend/utils/adt/xml.c b/src/backend/utils/adt/xml.c index d7264eb156e..5cb761773d9 100644 --- a/src/backend/utils/adt/xml.c +++ b/src/backend/utils/adt/xml.c @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/backend/utils/adt/xml.c,v 1.85 2009/03/27 18:56:57 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/utils/adt/xml.c,v 1.86 2009/04/08 21:51:38 petere Exp $ * *------------------------------------------------------------------------- */ @@ -572,7 +572,7 @@ xmlelement(XmlExprState *xmlExpr, ExprContext *econtext) if (isnull) str = NULL; else - str = OutputFunctionCall(&xmlExpr->named_outfuncs[i], value); + str = map_sql_value_to_xml_value(value, exprType((Node *) e->expr)); named_arg_strings = lappend(named_arg_strings, str); i++; } @@ -609,12 +609,9 @@ xmlelement(XmlExprState *xmlExpr, ExprContext *econtext) char *argname = strVal(lfirst(narg)); if (str) - { xmlTextWriterWriteAttribute(writer, (xmlChar *) argname, (xmlChar *) str); - pfree(str); - } } foreach(arg, arg_strings) |