mirror of https://github.com/postgres/postgres
Prior to 8.3, these changes are not critical for compatibility with core Postgres, since core had no libxml2 calls then. However there is still a risk if contrib/xml2 is used along with libxml2 functionality in Perl or other loadable modules. So back-patch to all versions. Also back-patch addition of regression tests. I'm not sure how many of the cases are interesting without the interaction with core xml code, but a silly regression test is still better than none at all.REL8_4_STABLE
Tom Lane
16 years ago
parent
a7ac5c64fd
commit
8748dc3580
@ -0,0 +1,147 @@ |
||||
-- |
||||
-- first, define the functions. Turn off echoing so that expected file |
||||
-- does not depend on contents of pgxml.sql. |
||||
-- |
||||
SET client_min_messages = warning; |
||||
\set ECHO none |
||||
RESET client_min_messages; |
||||
select query_to_xml('select 1 as x',true,false,''); |
||||
query_to_xml |
||||
--------------------------------------------------------------- |
||||
<table xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> |
||||
|
||||
<row> |
||||
<x>1</x> |
||||
</row> |
||||
|
||||
</table> |
||||
|
||||
(1 row) |
||||
|
||||
select xslt_process( query_to_xml('select x from generate_series(1,5) as |
||||
x',true,false,'')::text, |
||||
$$<xsl:stylesheet version="1.0" |
||||
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"> |
||||
<xsl:output method="xml" indent="yes" /> |
||||
<xsl:template match="*"> |
||||
<xsl:copy> |
||||
<xsl:copy-of select="@*" /> |
||||
<xsl:apply-templates /> |
||||
</xsl:copy> |
||||
</xsl:template> |
||||
<xsl:template match="comment()|processing-instruction()"> |
||||
<xsl:copy /> |
||||
</xsl:template> |
||||
</xsl:stylesheet> |
||||
$$::text); |
||||
xslt_process |
||||
--------------------------------------------------------------- |
||||
<?xml version="1.0"?> |
||||
<table xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> |
||||
|
||||
<row> |
||||
<x>1</x> |
||||
</row> |
||||
|
||||
<row> |
||||
<x>2</x> |
||||
</row> |
||||
|
||||
<row> |
||||
<x>3</x> |
||||
</row> |
||||
|
||||
<row> |
||||
<x>4</x> |
||||
</row> |
||||
|
||||
<row> |
||||
<x>5</x> |
||||
</row> |
||||
|
||||
</table> |
||||
|
||||
(1 row) |
||||
|
||||
CREATE TABLE xpath_test (id integer NOT NULL, t xml); |
||||
INSERT INTO xpath_test VALUES (1, '<doc><int>1</int></doc>'); |
||||
SELECT * FROM xpath_table('id', 't', 'xpath_test', '/doc/int', 'true') |
||||
as t(id int4); |
||||
id |
||||
---- |
||||
(0 rows) |
||||
|
||||
SELECT * FROM xpath_table('id', 't', 'xpath_test', '/doc/int', 'true') |
||||
as t(id int4, doc int4); |
||||
id | doc |
||||
----+----- |
||||
1 | 1 |
||||
(1 row) |
||||
|
||||
DROP TABLE xpath_test; |
||||
CREATE TABLE xpath_test (id integer NOT NULL, t text); |
||||
INSERT INTO xpath_test VALUES (1, '<doc><int>1</int></doc>'); |
||||
SELECT * FROM xpath_table('id', 't', 'xpath_test', '/doc/int', 'true') |
||||
as t(id int4); |
||||
id |
||||
---- |
||||
(0 rows) |
||||
|
||||
SELECT * FROM xpath_table('id', 't', 'xpath_test', '/doc/int', 'true') |
||||
as t(id int4, doc int4); |
||||
id | doc |
||||
----+----- |
||||
1 | 1 |
||||
(1 row) |
||||
|
||||
create table articles (article_id integer, article_xml xml, date_entered date); |
||||
insert into articles (article_id, article_xml, date_entered) |
||||
values (2, '<article><author>test</author><pages>37</pages></article>', now()); |
||||
SELECT * FROM |
||||
xpath_table('article_id', |
||||
'article_xml', |
||||
'articles', |
||||
'/article/author|/article/pages|/article/title', |
||||
'date_entered > ''2003-01-01'' ') |
||||
AS t(article_id integer, author text, page_count integer, title text); |
||||
article_id | author | page_count | title |
||||
------------+--------+------------+------- |
||||
2 | test | 37 | |
||||
(1 row) |
||||
|
||||
-- this used to fail when invoked a second time |
||||
select xslt_process('<aaa/>',$$<xsl:stylesheet version="1.0" |
||||
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"> |
||||
<xsl:template match="@*|node()"> |
||||
<xsl:copy> |
||||
<xsl:apply-templates select="@*|node()"/> |
||||
</xsl:copy> |
||||
</xsl:template> |
||||
</xsl:stylesheet>$$)::xml; |
||||
xslt_process |
||||
-------------- |
||||
<aaa/> |
||||
|
||||
(1 row) |
||||
|
||||
select xslt_process('<aaa/>',$$<xsl:stylesheet version="1.0" |
||||
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"> |
||||
<xsl:template match="@*|node()"> |
||||
<xsl:copy> |
||||
<xsl:apply-templates select="@*|node()"/> |
||||
</xsl:copy> |
||||
</xsl:template> |
||||
</xsl:stylesheet>$$)::xml; |
||||
xslt_process |
||||
-------------- |
||||
<aaa/> |
||||
|
||||
(1 row) |
||||
|
||||
create table t1 (id integer, xml_data xml); |
||||
insert into t1 (id, xml_data) |
||||
values |
||||
(1, '<attributes><attribute name="attr_1">Some |
||||
Value</attribute></attributes>'); |
||||
create index idx_xpath on t1 ( xpath_string |
||||
('/attributes/attribute[@name="attr_1"]/text()', xml_data::text)); |
||||
@ -0,0 +1,82 @@ |
||||
-- |
||||
-- first, define the functions. Turn off echoing so that expected file |
||||
-- does not depend on contents of pgxml.sql. |
||||
-- |
||||
SET client_min_messages = warning; |
||||
\set ECHO none |
||||
\i pgxml.sql |
||||
\set ECHO all |
||||
RESET client_min_messages; |
||||
|
||||
select query_to_xml('select 1 as x',true,false,''); |
||||
|
||||
select xslt_process( query_to_xml('select x from generate_series(1,5) as |
||||
x',true,false,'')::text, |
||||
$$<xsl:stylesheet version="1.0" |
||||
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"> |
||||
<xsl:output method="xml" indent="yes" /> |
||||
<xsl:template match="*"> |
||||
<xsl:copy> |
||||
<xsl:copy-of select="@*" /> |
||||
<xsl:apply-templates /> |
||||
</xsl:copy> |
||||
</xsl:template> |
||||
<xsl:template match="comment()|processing-instruction()"> |
||||
<xsl:copy /> |
||||
</xsl:template> |
||||
</xsl:stylesheet> |
||||
$$::text); |
||||
|
||||
CREATE TABLE xpath_test (id integer NOT NULL, t xml); |
||||
INSERT INTO xpath_test VALUES (1, '<doc><int>1</int></doc>'); |
||||
SELECT * FROM xpath_table('id', 't', 'xpath_test', '/doc/int', 'true') |
||||
as t(id int4); |
||||
SELECT * FROM xpath_table('id', 't', 'xpath_test', '/doc/int', 'true') |
||||
as t(id int4, doc int4); |
||||
|
||||
DROP TABLE xpath_test; |
||||
CREATE TABLE xpath_test (id integer NOT NULL, t text); |
||||
INSERT INTO xpath_test VALUES (1, '<doc><int>1</int></doc>'); |
||||
SELECT * FROM xpath_table('id', 't', 'xpath_test', '/doc/int', 'true') |
||||
as t(id int4); |
||||
SELECT * FROM xpath_table('id', 't', 'xpath_test', '/doc/int', 'true') |
||||
as t(id int4, doc int4); |
||||
|
||||
create table articles (article_id integer, article_xml xml, date_entered date); |
||||
insert into articles (article_id, article_xml, date_entered) |
||||
values (2, '<article><author>test</author><pages>37</pages></article>', now()); |
||||
SELECT * FROM |
||||
xpath_table('article_id', |
||||
'article_xml', |
||||
'articles', |
||||
'/article/author|/article/pages|/article/title', |
||||
'date_entered > ''2003-01-01'' ') |
||||
AS t(article_id integer, author text, page_count integer, title text); |
||||
|
||||
-- this used to fail when invoked a second time |
||||
select xslt_process('<aaa/>',$$<xsl:stylesheet version="1.0" |
||||
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"> |
||||
<xsl:template match="@*|node()"> |
||||
<xsl:copy> |
||||
<xsl:apply-templates select="@*|node()"/> |
||||
</xsl:copy> |
||||
</xsl:template> |
||||
</xsl:stylesheet>$$)::xml; |
||||
|
||||
select xslt_process('<aaa/>',$$<xsl:stylesheet version="1.0" |
||||
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"> |
||||
<xsl:template match="@*|node()"> |
||||
<xsl:copy> |
||||
<xsl:apply-templates select="@*|node()"/> |
||||
</xsl:copy> |
||||
</xsl:template> |
||||
</xsl:stylesheet>$$)::xml; |
||||
|
||||
create table t1 (id integer, xml_data xml); |
||||
insert into t1 (id, xml_data) |
||||
values |
||||
(1, '<attributes><attribute name="attr_1">Some |
||||
Value</attribute></attributes>'); |
||||
|
||||
create index idx_xpath on t1 ( xpath_string |
||||
('/attributes/attribute[@name="attr_1"]/text()', xml_data::text)); |
||||
Loading…
Reference in new issue