From a84bf4922e566f047536112a2aaf488559ee62dd Mon Sep 17 00:00:00 2001 From: Peter Eisentraut Date: Thu, 12 Jul 2012 23:47:33 +0300 Subject: Avoid extra newlines in XML mapping in table forest mode found by P. Broennimann --- src/backend/utils/adt/xml.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'src/backend/utils/adt/xml.c') diff --git a/src/backend/utils/adt/xml.c b/src/backend/utils/adt/xml.c index 44d327d7606..a9150e85692 100644 --- a/src/backend/utils/adt/xml.c +++ b/src/backend/utils/adt/xml.c @@ -2383,7 +2383,7 @@ xmldata_root_element_start(StringInfo result, const char *eltname, else appendStringInfo(result, " xsi:noNamespaceSchemaLocation=\"#\""); } - appendStringInfo(result, ">\n\n"); + appendStringInfo(result, ">\n"); } @@ -2417,8 +2417,11 @@ query_to_xml_internal(const char *query, char *tablename, errmsg("invalid query"))); if (!tableforest) + { xmldata_root_element_start(result, xmltn, xmlschema, targetns, top_level); + appendStringInfoString(result, "\n"); + } if (xmlschema) appendStringInfo(result, "%s\n\n", xmlschema); @@ -2581,6 +2584,7 @@ schema_to_xml_internal(Oid nspid, const char *xmlschema, bool nulls, result = makeStringInfo(); xmldata_root_element_start(result, xmlsn, xmlschema, targetns, top_level); + appendStringInfoString(result, "\n"); if (xmlschema) appendStringInfo(result, "%s\n\n", xmlschema); @@ -2758,6 +2762,7 @@ database_to_xml_internal(const char *xmlschema, bool nulls, result = makeStringInfo(); xmldata_root_element_start(result, xmlcn, xmlschema, targetns, true); + appendStringInfoString(result, "\n"); if (xmlschema) appendStringInfo(result, "%s\n\n", xmlschema); -- cgit v1.2.3