diff options
| author | Peter Eisentraut <peter_e@gmx.net> | 2012-07-12 23:47:33 +0300 |
|---|---|---|
| committer | Peter Eisentraut <peter_e@gmx.net> | 2012-07-12 23:52:50 +0300 |
| commit | a84bf4922e566f047536112a2aaf488559ee62dd (patch) | |
| tree | 4115973917ba3e5d9f98bffe7d52a0b80dddf19f /src/backend/utils/adt/xml.c | |
| parent | a36088bcfae85eeeb55e85c3f06c61cb2f0621c6 (diff) | |
| download | postgresql-a84bf4922e566f047536112a2aaf488559ee62dd.tar.gz postgresql-a84bf4922e566f047536112a2aaf488559ee62dd.zip | |
Avoid extra newlines in XML mapping in table forest mode
found by P. Broennimann
Diffstat (limited to 'src/backend/utils/adt/xml.c')
| -rw-r--r-- | src/backend/utils/adt/xml.c | 7 |
1 files changed, 6 insertions, 1 deletions
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); |