diff --git a/src/test/regress/expected/xmlmap.out b/src/test/regress/expected/xmlmap.out
index c074761b60b..cf46c9ffb58 100644
--- a/src/test/regress/expected/xmlmap.out
+++ b/src/test/regress/expected/xmlmap.out
@@ -8,685 +8,685 @@ INSERT INTO testxmlschema.test2 VALUES (55, 'abc', 'def', 98.6, 2, 999, 0, '21:0
SELECT table_to_xml('testxmlschema.test1', false, false, '');
table_to_xml
---------------------------------------------------------------
-
-
-
- 1
- one
-
-
-
- 2
- two
-
-
-
- -1
-
-
-
+ +
+ +
+ +
+ 1 +
+ one +
+
+
+ +
+ +
+ 2 +
+ two +
+
+
+ +
+ +
+ -1 +
+
+
+ +
+ +
(1 row)
SELECT table_to_xml('testxmlschema.test1', true, false, 'foo');
table_to_xml
---------------------------------------------------------------------------
-
-
-
- 1
- one
-
-
-
- 2
- two
-
-
-
- -1
-
-
-
-
+ +
+ +
+ +
+ 1 +
+ one +
+
+
+ +
+ +
+ 2 +
+ two +
+
+
+ +
+ +
+ -1 +
+ +
+
+
+ +
+ +
(1 row)
SELECT table_to_xml('testxmlschema.test1', false, true, '');
table_to_xml
---------------------------------------------------------------
-
-
- 1
- one
-
-
-
-
- 2
- two
-
-
-
-
- -1
-
-
+ +
+ +
+ 1 +
+ one +
+ +
+ +
+ +
+ +
+ 2 +
+ two +
+ +
+ +
+ +
+ +
+ -1 +
+ +
+ +
(1 row)
SELECT table_to_xml('testxmlschema.test1', true, true, '');
table_to_xml
---------------------------------------------------------------
-
-
- 1
- one
-
-
-
-
- 2
- two
-
-
-
-
- -1
-
-
-
+ +
+ +
+ 1 +
+ one +
+ +
+ +
+ +
+ +
+ 2 +
+ two +
+ +
+ +
+ +
+ +
+ -1 +
+ +
+ +
+ +
(1 row)
SELECT table_to_xml('testxmlschema.test2', false, false, '');
table_to_xml
---------------------------------------------------------------
-
-
-
- 55
- abc
- def
- 98.60
- 2
- 999
- 0
- 21:07:00
- 2009-06-08T21:07:30
- 2009-06-08
- ABC
- true
- WFla
-
-
-
+ +
+ +
+ +
+ 55 +
+ abc +
+ def +
+ 98.60 +
+ 2 +
+ 999 +
+ 0 +
+ 21:07:00 +
+ 2009-06-08T21:07:30 +
+ 2009-06-08
+
+ ABC +
+ true +
+ WFla +
+
+
+ +
+ +
(1 row)
SELECT table_to_xmlschema('testxmlschema.test1', false, false, '');
table_to_xmlschema
-----------------------------------------------------------------------------------------------------------------
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
(1 row)
SELECT table_to_xmlschema('testxmlschema.test1', true, false, '');
table_to_xmlschema
-----------------------------------------------------------------------------------------------------------------
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
(1 row)
SELECT table_to_xmlschema('testxmlschema.test1', false, true, 'foo');
table_to_xmlschema
----------------------------------------------------------------------------------------------
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
(1 row)
SELECT table_to_xmlschema('testxmlschema.test1', true, true, '');
table_to_xmlschema
------------------------------------------------------------------------------------------------
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
(1 row)
SELECT table_to_xmlschema('testxmlschema.test2', false, false, '');
table_to_xmlschema
-----------------------------------------------------------------------------------------------------------------
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
(1 row)
SELECT table_to_xml_and_xmlschema('testxmlschema.test1', false, false, '');
table_to_xml_and_xmlschema
-----------------------------------------------------------------------------------------------------------------
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 1
- one
-
-
-
- 2
- two
-
-
-
- -1
-
-
-
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ 1 +
+ one +
+
+
+ +
+ +
+ 2 +
+ two +
+
+
+ +
+ +
+ -1 +
+
+
+ +
+ +
(1 row)
SELECT table_to_xml_and_xmlschema('testxmlschema.test1', true, false, '');
table_to_xml_and_xmlschema
-----------------------------------------------------------------------------------------------------------------
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 1
- one
-
-
-
- 2
- two
-
-
-
- -1
-
-
-
-
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ 1 +
+ one +
+
+
+ +
+ +
+ 2 +
+ two +
+
+
+ +
+ +
+ -1 +
+ +
+
+
+ +
+ +
(1 row)
SELECT table_to_xml_and_xmlschema('testxmlschema.test1', false, true, '');
table_to_xml_and_xmlschema
----------------------------------------------------------------------------------------------
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 1
- one
-
-
-
-
- 2
- two
-
-
-
-
- -1
-
-
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ 1 +
+ one +
+ +
+ +
+ +
+ +
+ 2 +
+ two +
+ +
+ +
+ +
+ +
+ -1 +
+ +
+ +
(1 row)
SELECT table_to_xml_and_xmlschema('testxmlschema.test1', true, true, 'foo');
table_to_xml_and_xmlschema
------------------------------------------------------------------------------------------------
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 1
- one
-
-
-
-
- 2
- two
-
-
-
-
- -1
-
-
-
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ 1 +
+ one +
+ +
+ +
+ +
+ +
+ 2 +
+ two +
+ +
+ +
+ +
+ +
+ -1 +
+ +
+ +
+ +
(1 row)
SELECT query_to_xml('SELECT * FROM testxmlschema.test1', false, false, '');
query_to_xml
---------------------------------------------------------------
-
-
-
- 1
- one
-
-
-
- 2
- two
-
-
-
- -1
-
-
-
+ +
+ +
+ +
+ 1 +
+ one +
+
+
+ +
+ +
+ 2 +
+ two +
+
+
+ +
+ +
+ -1 +
+
+
+ +
+
+
(1 row)
SELECT query_to_xmlschema('SELECT * FROM testxmlschema.test1', false, false, '');
query_to_xmlschema
----------------------------------------------------------------------------------------------
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
(1 row)
SELECT query_to_xml_and_xmlschema('SELECT * FROM testxmlschema.test1', true, true, '');
query_to_xml_and_xmlschema
------------------------------------------------------------------------------------------------
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 1
- one
-
-
-
-
- 2
- two
-
-
-
-
- -1
-
-
-
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ 1 +
+ one +
+
+
+ +
+ +
+ +
+ 2 +
+ two +
+
+
+ +
+ +
+ +
+ -1 +
+ +
+
+
+ +
(1 row)
@@ -694,23 +694,23 @@ DECLARE xc CURSOR WITH HOLD FOR SELECT * FROM testxmlschema.test1 ORDER BY 1, 2;
SELECT cursor_to_xml('xc'::refcursor, 5, false, true, '');
cursor_to_xml
-------------------------------------------------------------
-
-
- -1
-
-
-
-
- 1
- one
-
-
-
-
- 2
- two
-
-
+ +
+ +
+ -1 +
+
+
+ +
+ +
+ +
+ 1 +
+ one +
+
+
+ +
+ +
+ +
+ 2 +
+ two +
+
+
+ +
(1 row)
@@ -718,485 +718,485 @@ MOVE FIRST IN xc;
SELECT cursor_to_xml('xc'::refcursor, 5, true, false, '');
cursor_to_xml
---------------
-
- 1
- one
-
-
-
- 2
- two
-
-
+ +
+ 1 +
+ one +
+
+
+ +
+ +
+ 2 +
+ two +
+
+
+ +
(1 row)
SELECT cursor_to_xmlschema('xc'::refcursor, true, false, '');
cursor_to_xmlschema
------------------------------------------------------------------------------------------------
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
(1 row)
SELECT schema_to_xml('testxmlschema', false, true, '');
schema_to_xml
-----------------------------------------------------------------------
-
-
-
-
- 1
- one
-
-
-
-
- 2
- two
-
-
-
-
- -1
-
-
-
-
-
- 55
- abc
- def
- 98.60
- 2
- 999
- 0
- 21:07:00
- 2009-06-08T21:07:30
- 2009-06-08
- ABC
- true
- WFla
-
-
-
-
+ +
+ +
+ +
+ +
+ 1 +
+ one +
+ +
+ +
+ +
+ +
+ 2 +
+ two +
+ +
+ +
+ +
+ +
+ -1 +
+ +
+ +
+ +
+ +
+ +
+ 55 +
+ abc +
+ def +
+ 98.60 +
+ 2 +
+ 999 +
+ 0 +
+ 21:07:00 +
+ 2009-06-08T21:07:30 +
+ 2009-06-08
+
+ ABC +
+ true +
+ WFla +
+ +
+ +
+ +
+ +
(1 row)
SELECT schema_to_xml('testxmlschema', true, false, '');
schema_to_xml
-----------------------------------------------------------------------
-
-
-
-
-
- 1
- one
-
-
-
- 2
- two
-
-
-
- -1
-
-
-
-
-
-
-
-
- 55
- abc
- def
- 98.60
- 2
- 999
- 0
- 21:07:00
- 2009-06-08T21:07:30
- 2009-06-08
-
- ABC
- true
- WFla
-
-
-
-
-
+ +
+ +
+ +
+ +
+ +
+ 1 +
+ one +
+
+
+ +
+ +
+ 2 +
+ two +
+
+
+ +
+ +
+ -1 +
+ +
+
+
+ +
+ +
+ +
+ +
+ +
+ +
+ 55 +
+ abc +
+ def +
+ 98.60 +
+ 2 +
+ 999 +
+ 0 +
+ 21:07:00 +
+ 2009-06-08T21:07:30 +
+ 2009-06-08
+
+ +
+ ABC +
+ true +
+ WFla +
+
+
+ +
+ +
+ +
+ +
(1 row)
SELECT schema_to_xmlschema('testxmlschema', false, true, '');
schema_to_xmlschema
-------------------------------------------------------------------------------------------------------------------
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
(1 row)
SELECT schema_to_xmlschema('testxmlschema', true, false, '');
schema_to_xmlschema
---------------------------------------------------------------------------------------------------
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
(1 row)
SELECT schema_to_xml_and_xmlschema('testxmlschema', true, true, 'foo');
schema_to_xml_and_xmlschema
-------------------------------------------------------------------------------------------------------------------
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 1
- one
-
-
-
-
- 2
- two
-
-
-
-
- -1
-
-
-
-
-
-
- 55
- abc
- def
- 98.60
- 2
- 999
- 0
- 21:07:00
- 2009-06-08T21:07:30
- 2009-06-08
-
- ABC
- true
- WFla
-
-
-
-
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ 1 +
+ one +
+ +
+ +
+ +
+ +
+ 2 +
+ two +
+ +
+ +
+ +
+ +
+ -1 +
+ +
+ +
+ +
+ +
+ +
+ +
+ 55 +
+ abc +
+ def +
+ 98.60 +
+ 2 +
+ 999 +
+ 0 +
+ 21:07:00 +
+ 2009-06-08T21:07:30 +
+ 2009-06-08
+
+ +
+ ABC +
+ true +
+ WFla +
+ +
+ +
+ +
+ +
(1 row)