mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Commit newest version of xmlpath().

Browse Source 
Nikolay Samokhvalov
This commit is contained in:
Bruce Momjian 2007-03-22 20:26:30 +00:00
parent f317a03734
commit ea3b212fee
4 changed files with 37 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/backend/utils/adt/xml.c
View File

@ -7,7 +7,7 @@
* Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* $PostgreSQL: pgsql/src/backend/utils/adt/xml.c,v 1.36 2007/03/22 20:14:58 momjian Exp $ * $PostgreSQL: pgsql/src/backend/utils/adt/xml.c,v 1.37 2007/03/22 20:26:30 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -91,7 +91,7 @@ static xmlChar *xml_text2xmlChar(text *in);
static int parse_xml_decl(const xmlChar *str, size_t *lenp, xmlChar **version, xmlChar **encoding, int *standalone); static int parse_xml_decl(const xmlChar *str, size_t *lenp, xmlChar **version, xmlChar **encoding, int *standalone);
static bool print_xml_decl(StringInfo buf, const xmlChar *version, pg_enc encoding, int standalone); static bool print_xml_decl(StringInfo buf, const xmlChar *version, pg_enc encoding, int standalone);
static xmlDocPtr xml_parse(text *data, XmlOptionType xmloption_arg, bool preserve_whitespace, xmlChar *encoding); static xmlDocPtr xml_parse(text *data, XmlOptionType xmloption_arg, bool preserve_whitespace, xmlChar *encoding);
static text *xml_xmlnodetotext(xmlNodePtr cur); static text *xml_xmlnodetoxmltype(xmlNodePtr cur);
#endif /* USE_LIBXML */ #endif /* USE_LIBXML */
@ -2414,20 +2414,31 @@ SPI_sql_row_to_xmlelement(int rownum, StringInfo result, char *tablename, bool n
#ifdef USE_LIBXML #ifdef USE_LIBXML
/* /*
* Convert XML node to text (return value only, it's not dumping) * Convert XML node to text (dump subtree in case of element, return value otherwise)
*/ */
text * text *
xml_xmlnodetotext(xmlNodePtr cur) xml_xmlnodetoxmltype(xmlNodePtr cur)
{ {
xmlChar *str; xmlChar *str;
text *result; xmltype *result;
size_t len; size_t len;
xmlBufferPtr buf;
if (cur->type == XML_ELEMENT_NODE)
{
buf = xmlBufferCreate();
xmlNodeDump(buf, NULL, cur, 0, 1);
result = xmlBuffer_to_xmltype(buf);
xmlBufferFree(buf);
}
else
{
str = xmlXPathCastNodeToString(cur); str = xmlXPathCastNodeToString(cur);
len = strlen((char *) str); len = strlen((char *) str);
result = (text *) palloc(len + VARHDRSZ); result = (text *) palloc(len + VARHDRSZ);
SET_VARSIZE(result, len + VARHDRSZ); SET_VARSIZE(result, len + VARHDRSZ);
memcpy(VARDATA(result), str, len); memcpy(VARDATA(result), str, len);
}
return result; return result;
} }
@ -2607,7 +2618,7 @@ xmlpath(PG_FUNCTION_ARGS)
{ {
Datum elem; Datum elem;
bool elemisnull = false; bool elemisnull = false;
elem = PointerGetDatum(xml_xmlnodetotext(xpathobj->nodesetval->nodeTab[i])); elem = PointerGetDatum(xml_xmlnodetoxmltype(xpathobj->nodesetval->nodeTab[i]));
astate = accumArrayResult(astate, elem, astate = accumArrayResult(astate, elem,
elemisnull, XMLOID, elemisnull, XMLOID,
CurrentMemoryContext); CurrentMemoryContext);

12
src/test/regress/expected/xml.out
View File

@ -404,9 +404,9 @@ SELECT table_name, view_definition FROM information_schema.views
-- Text XPath expressions evaluation -- Text XPath expressions evaluation
SELECT xmlpath('/value', data) FROM xmltest; SELECT xmlpath('/value', data) FROM xmltest;
xmlpath xmlpath
--------- ----------------------
{one} {<value>one</value>}
{two} {<value>two</value>}
(2 rows) (2 rows)
SELECT xmlpath(NULL, NULL) IS NULL FROM xmltest; SELECT xmlpath(NULL, NULL) IS NULL FROM xmltest;
@ -431,3 +431,9 @@ SELECT xmlpath('//loc:piece/@id', '<local:data xmlns:local="http://127.0.0.1"><l
{1,2} {1,2}
(1 row) (1 row)
SELECT xmlpath('//b', '<a>one <b>two</b> three <b>etc</b></a>');
xmlpath
-------------------------
{<b>two</b>,<b>etc</b>}
(1 row)

2
src/test/regress/expected/xml_1.out
View File

@ -212,3 +212,5 @@ SELECT xmlpath('//text()', '<local:data xmlns:local="http://127.0.0.1"><local:pi
ERROR: no XML support in this installation ERROR: no XML support in this installation
SELECT xmlpath('//loc:piece/@id', '<local:data xmlns:local="http://127.0.0.1"><local:piece id="1">number one</local:piece><local:piece id="2" /></local:data>', ARRAY[ARRAY['loc'], ARRAY['http://127.0.0.1']]); SELECT xmlpath('//loc:piece/@id', '<local:data xmlns:local="http://127.0.0.1"><local:piece id="1">number one</local:piece><local:piece id="2" /></local:data>', ARRAY[ARRAY['loc'], ARRAY['http://127.0.0.1']]);
ERROR: no XML support in this installation ERROR: no XML support in this installation
SELECT xmlpath('//b', '<a>one <b>two</b> three <b>etc</b></a>');
ERROR: no XML support in this installation

1
src/test/regress/sql/xml.sql
View File

@ -152,3 +152,4 @@ SELECT xmlpath(NULL, NULL) IS NULL FROM xmltest;
SELECT xmlpath('', '<!-- error -->'); SELECT xmlpath('', '<!-- error -->');
SELECT xmlpath('//text()', '<local:data xmlns:local="http://127.0.0.1"><local:piece id="1">number one</local:piece><local:piece id="2" /></local:data>'); SELECT xmlpath('//text()', '<local:data xmlns:local="http://127.0.0.1"><local:piece id="1">number one</local:piece><local:piece id="2" /></local:data>');
SELECT xmlpath('//loc:piece/@id', '<local:data xmlns:local="http://127.0.0.1"><local:piece id="1">number one</local:piece><local:piece id="2" /></local:data>', ARRAY[ARRAY['loc'], ARRAY['http://127.0.0.1']]); SELECT xmlpath('//loc:piece/@id', '<local:data xmlns:local="http://127.0.0.1"><local:piece id="1">number one</local:piece><local:piece id="2" /></local:data>', ARRAY[ARRAY['loc'], ARRAY['http://127.0.0.1']]);
SELECT xmlpath('//b', '<a>one <b>two</b> three <b>etc</b></a>');