From 8b35795362be5fd06fe22575a64bce81002a22c2 Mon Sep 17 00:00:00 2001
From: Peter Eisentraut <peter_e@gmx.net>
Date: Fri, 12 Jan 2007 21:47:27 +0000
Subject: Use XML output escaping also in XMLFOREST.

---
 src/backend/executor/execQual.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'src/backend/executor')

diff --git a/src/backend/executor/execQual.c b/src/backend/executor/execQual.c
index 994f7d57ac4..8052f8b2d76 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.205 2007/01/10 20:33:54 petere Exp $
+ *	  $PostgreSQL: pgsql/src/backend/executor/execQual.c,v 1.206 2007/01/12 21:47:26 petere Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -2692,11 +2692,10 @@ ExecEvalXml(XmlExprState *xmlExpr, ExprContext *econtext,
 				value = ExecEvalExpr(e, econtext, &isnull, NULL);
 				if (!isnull)
 				{
-					str = OutputFunctionCall(&xmlExpr->named_outfuncs[i],
-											 value);
 					appendStringInfo(&buf, "<%s>%s</%s>",
-									 argname, str, argname);
-					pfree(str);
+									 argname,
+									 map_sql_value_to_xml_value(value, exprType((Node *) e->expr)),
+									 argname);
 					*isNull = false;
 				}
 				i++;
-- 
cgit v1.2.3