projects / postgresql.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 4dd4104)
Fix cursor_to_xml in tableforest false mode
authorPeter Eisentraut
Thu, 4 May 2017 01:25:01 +0000 (21:25 -0400)
committerPeter Eisentraut
Thu, 4 May 2017 01:41:10 +0000 (21:41 -0400)
It only produced  elements but no wrapping  element.

By contrast, cursor_to_xmlschema produced a schema that is now correct
but did not previously match the XML data produced by cursor_to_xml.

In passing, also fix a minor misunderstanding about moving cursors in
the tests related to this.

Reported-by: [email protected]
Based-on-patch-by: Thomas Munro
src/backend/utils/adt/xml.c patch | blob | blame | history
src/test/regress/expected/xmlmap.out patch | blob | blame | history
src/test/regress/expected/xmlmap_1.out patch | blob | blame | history
src/test/regress/sql/xmlmap.sql patch | blob | blame | history

diff --git a/src/backend/utils/adt/xml.c b/src/backend/utils/adt/xml.c
index 2f87151beccc7da1be09b077558303d860cac77a..42cffbbdd39e79cfb1b35d148a4b94e756d23062 100644 (file)
--- a/src/backend/utils/adt/xml.c
+++ b/src/backend/utils/adt/xml.c
@@ -149,6 +149,10 @@ static int xml_xpathobjtoxmlarray(xmlXPathObjectPtr xpathobj,
 static xmlChar *pg_xmlCharStrndup(char *str, size_t len);
 #endif   /* USE_LIBXML */
 
+static void xmldata_root_element_start(StringInfo result, const char *eltname,
+                          const char *xmlschema, const char *targetns,
+                          bool top_level);
+static void xmldata_root_element_end(StringInfo result, const char *eltname);
 static StringInfo query_to_xml_internal(const char *query, char *tablename,
                      const char *xmlschema, bool nulls, bool tableforest,
                      const char *targetns, bool top_level);
@@ -2451,6 +2455,12 @@ cursor_to_xml(PG_FUNCTION_ARGS)
 
    initStringInfo(&result);
 
+   if (!tableforest)
+   {
+       xmldata_root_element_start(&result, "table", NULL, targetns, true);
+       appendStringInfoChar(&result, '\n');
+   }
+
    SPI_connect();
    portal = SPI_cursor_find(name);
    if (portal == NULL)
@@ -2465,6 +2475,9 @@ cursor_to_xml(PG_FUNCTION_ARGS)
 
    SPI_finish();
 
+   if (!tableforest)
+       xmldata_root_element_end(&result, "table");
+
    PG_RETURN_XML_P(stringinfo_to_xmltype(&result));
 }
 
diff --git a/src/test/regress/expected/xmlmap.out b/src/test/regress/expected/xmlmap.out
index b50396face9d56a0810dfa7649c0e2f597aef5b1..c08f8a0d9c17a466c63a83150ce2baa49445f971 100644 (file)
--- a/src/test/regress/expected/xmlmap.out
+++ b/src/test/regress/expected/xmlmap.out
@@ -696,20 +696,58 @@ SELECT cursor_to_xml('xc'::refcursor, 5, false, true, '');
  
 (1 row)
 
-MOVE FIRST IN xc;
+SELECT cursor_to_xmlschema('xc'::refcursor, false, true, '');
+                                     cursor_to_xmlschema                                      
+----------------------------------------------------------------------------------------------
+ 
+     xmlns:xsd="http://www.w3.org/2001/XMLSchema">                                           +
+                                                                                             +
+                                                              +
+                                                             +
+                                                       +
+                                                      +
+                                                                           +
+                                                                            +
+                                                                                             +
+                                       +
+                                                          +
+                                                                           +
+                                                                            +
+                                                                                             +
+                                                             +
+                                                                               +
+                            +
+     +
+                                                                              +
+                                                                           +
+                                                                                             +
+                                                     +
+                                                                                             +
+ 
+(1 row)
+
+MOVE BACKWARD ALL IN xc;
 SELECT cursor_to_xml('xc'::refcursor, 5, true, false, '');
- cursor_to_xml 
----------------
-         +
-   1   +
-   one +
-        +
-              +
-         +
-   2   +
-   two +
-        +
-              +
+                         cursor_to_xml                         
+---------------------------------------------------------------
+ +
+                                                              +
+                                                         +
+   -1                                                  +
+                                           +
+                                                        +
+                                                              +
+                                                         +
+   1                                                   +
+   one                                                 +
+                                                        +
+                                                              +
+                                                         +
+   2                                                   +
+   two                                                 +
+                                                        +
+                                                              +
+                                                      +
  
 (1 row)
 
diff --git a/src/test/regress/expected/xmlmap_1.out b/src/test/regress/expected/xmlmap_1.out
index d67ef6d3e24c3068b8c335156577c3340ba517ac..f6dbf81666aa213d7df92dfab311c12fef0b712d 100644 (file)
--- a/src/test/regress/expected/xmlmap_1.out
+++ b/src/test/regress/expected/xmlmap_1.out
@@ -78,7 +78,11 @@ SELECT cursor_to_xml('xc'::refcursor, 5, false, true, '');
 ERROR:  unsupported XML feature
 DETAIL:  This functionality requires the server to be built with libxml support.
 HINT:  You need to rebuild PostgreSQL using --with-libxml.
-MOVE FIRST IN xc;
+SELECT cursor_to_xmlschema('xc'::refcursor, false, true, '');
+ERROR:  unsupported XML feature
+DETAIL:  This functionality requires the server to be built with libxml support.
+HINT:  You need to rebuild PostgreSQL using --with-libxml.
+MOVE BACKWARD ALL IN xc;
 SELECT cursor_to_xml('xc'::refcursor, 5, true, false, '');
 ERROR:  unsupported XML feature
 DETAIL:  This functionality requires the server to be built with libxml support.
diff --git a/src/test/regress/sql/xmlmap.sql b/src/test/regress/sql/xmlmap.sql
index 8f8d680813975b04d324ad930af9f955f0a8a669..fde1b9eb597f2d94d9122f5db237f4fb0f057c31 100644 (file)
--- a/src/test/regress/sql/xmlmap.sql
+++ b/src/test/regress/sql/xmlmap.sql
@@ -30,7 +30,8 @@ SELECT query_to_xml_and_xmlschema('SELECT * FROM testxmlschema.test1', true, tru
 
 DECLARE xc CURSOR WITH HOLD FOR SELECT * FROM testxmlschema.test1 ORDER BY 1, 2;
 SELECT cursor_to_xml('xc'::refcursor, 5, false, true, '');
-MOVE FIRST IN xc;
+SELECT cursor_to_xmlschema('xc'::refcursor, false, true, '');
+MOVE BACKWARD ALL IN xc;
 SELECT cursor_to_xml('xc'::refcursor, 5, true, false, '');
 SELECT cursor_to_xmlschema('xc'::refcursor, true, false, '');
 
This is the main PostgreSQL git repository.