Fix handling of namespace nodes in xpath() (xml)

xpath() attempted to call xmlCopyNode() and xmlNodeDump() on a
XML_NAMESPACE_DECL, finishing with a confusing error:
=# SELECT xpath('//namespace::foo', '<root xmlns:foo="http://127.0.0.1"/>');
ERROR:  53200: could not copy node
CONTEXT:  SQL function "xpath" statement 1

xpath() is changed so as it goes through xmlXPathCastNodeToString()
instead, that is able to handle namespace nodes.  xml2 uses the same
solution.  This issue has been discovered while digging into
9d33a5a804db.

Author: Michael Paquier <michael@paquier.xyz>
Discussion: https://postgr.es/m/aioT7ui_ZJ9RMlfM@paquier.xyz
Backpatch-through: 14

diff --git a/src/backend/utils/adt/xml.c b/src/backend/utils/adt/xml.c
index 2c7f778cfdb7a416da533e6cb570dc0c4398946d..0953ad2becb031aa3f8681824d6ee516938eda34 100644 (file)
--- a/src/backend/utils/adt/xml.c
+++ b/src/backend/utils/adt/xml.c
@@ -4199,7 +4199,9 @@ xml_xmlnodetoxmltype(xmlNodePtr cur, PgXmlErrorContext *xmlerrcxt)
 {
        xmltype    *result = NULL;
 
-       if (cur->type != XML_ATTRIBUTE_NODE && cur->type != XML_TEXT_NODE)
+       if (cur->type != XML_ATTRIBUTE_NODE &&
+               cur->type != XML_TEXT_NODE &&
+               cur->type != XML_NAMESPACE_DECL)
        {
                void            (*volatile nodefree) (xmlNodePtr) = NULL;
                volatile xmlBufferPtr buf = NULL;

diff --git a/src/test/regress/expected/xml.out b/src/test/regress/expected/xml.out
index 449733f8ae92698ae9fba8f51baa8ce73301b37b..3e80a7ff465dd13ab35b3b9f75cbd8f4df9f50f2 100644 (file)
--- a/src/test/regress/expected/xml.out
+++ b/src/test/regress/expected/xml.out
@@ -944,6 +944,12 @@ SELECT xpath('root', '<root/>');
  {<root/>}
 (1 row)
 
+SELECT xpath('//namespace::foo', '<root xmlns:foo="http://127.0.0.1"/>');
+       xpath        
+--------------------
+ {http://127.0.0.1}
+(1 row)
+
 -- Round-trip non-ASCII data through xpath().
 DO $$
 DECLARE

diff --git a/src/test/regress/expected/xml_1.out b/src/test/regress/expected/xml_1.out
index a962fce36b91d2f216808dde0214eefa8bda9870..2697c68a5116fed0edd09c1c88665ce72f61b8fe 100644 (file)
--- a/src/test/regress/expected/xml_1.out
+++ b/src/test/regress/expected/xml_1.out
@@ -687,6 +687,11 @@ ERROR:  unsupported XML feature
 LINE 1: SELECT xpath('root', '<root/>');
                              ^
 DETAIL:  This functionality requires the server to be built with libxml support.
+SELECT xpath('//namespace::foo', '<root xmlns:foo="http://127.0.0.1"/>');
+ERROR:  unsupported XML feature
+LINE 1: SELECT xpath('//namespace::foo', '<root xmlns:foo="http://12...
+                                         ^
+DETAIL:  This functionality requires the server to be built with libxml support.
 -- Round-trip non-ASCII data through xpath().
 DO $$
 DECLARE

diff --git a/src/test/regress/sql/xml.sql b/src/test/regress/sql/xml.sql
index a771a441c36e8e9c4a897bbab3a4e47729d9986a..2b8445e499ec2971c2c52b0c83631b94c568c0c3 100644 (file)
--- a/src/test/regress/sql/xml.sql
+++ b/src/test/regress/sql/xml.sql
@@ -244,6 +244,7 @@ SELECT xpath('count(//*)=3', '<root><sub/><sub/></root>');
 SELECT xpath('name(/*)', '<root><sub/><sub/></root>');
 SELECT xpath('/nosuchtag', '<root/>');
 SELECT xpath('root', '<root/>');
+SELECT xpath('//namespace::foo', '<root xmlns:foo="http://127.0.0.1"/>');
 
 -- Round-trip non-ASCII data through xpath().
 DO $$