diff options
| author | Peter Eisentraut <peter_e@gmx.net> | 2009-04-08 21:51:38 +0000 |
|---|---|---|
| committer | Peter Eisentraut <peter_e@gmx.net> | 2009-04-08 21:51:38 +0000 |
| commit | 77d67a4a3be1a2114ff9869fc3552a39fa7c5e68 (patch) | |
| tree | b9ce35991a7861160d1046b4e06eed5603e522bd /src/backend/utils/adt/xml.c | |
| parent | 84bb600be180c53addcbccba69be5134fcbce2dc (diff) | |
| download | postgresql-77d67a4a3be1a2114ff9869fc3552a39fa7c5e68.tar.gz postgresql-77d67a4a3be1a2114ff9869fc3552a39fa7c5e68.zip | |
XMLATTRIBUTES() should send the attribute values through
map_sql_value_to_xml_value() instead of directly through the data type output
function. This is per SQL standard, and consistent with XMLELEMENT().
Diffstat (limited to 'src/backend/utils/adt/xml.c')
| -rw-r--r-- | src/backend/utils/adt/xml.c | 7 |
1 files changed, 2 insertions, 5 deletions
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) |