From: | Tom Lane <tgl(at)sss(dot)pgh(dot)pa(dot)us> |
---|---|
To: | pgsql-committers(at)lists(dot)postgresql(dot)org |
Subject: | pgsql: Accept XML documents when xmloption = content, as required by SQ |
Date: | 2019-03-23 20:51:54 |
Message-ID: | E1h7ncQ-0000Ip-8J@gemulon.postgresql.org |
Views: | Raw Message | Whole Thread | Download mbox | Resend email |
Thread: | |
Lists: | pgsql-committers |
Accept XML documents when xmloption = content, as required by SQL:2006+.
Previously we were using the SQL:2003 definition, which doesn't allow
this, but that creates a serious dump/restore gotcha: there is no
setting of xmloption that will allow all valid XML data. Hence,
switch to the 2006 definition.
Since libxml doesn't accept <!DOCTYPE> directives in the mode we
use for CONTENT parsing, the implementation is to detect <!DOCTYPE>
in the input and switch to DOCUMENT parsing mode. This should not
cost much, because <!DOCTYPE> should be close to the front of the
input if it's there at all. It's possible that this causes the
error messages for malformed input to be slightly different than
they were before, if said input includes <!DOCTYPE>; but that does
not seem like a big problem.
In passing, buy back a few cycles in parsing of large XML documents
by not doing strlen() of the whole input in parse_xml_decl().
Back-patch because dump/restore failures are not nice. This change
shouldn't break any cases that worked before, so it seems safe to
back-patch.
Chapman Flack (revised a bit by me)
Discussion: https://postgr.es/m/CAN-V+g-6JqUQEQZ55Q3toXEN6d5Ez5uvzL4VR+8KtvJKj31taw@mail.gmail.com
Branch
------
REL_10_STABLE
Details
-------
https://git.postgresql.org/pg/commitdiff/754ffcd42006ec6afdf2b3236251a8b277f8f9eb
Modified Files
--------------
doc/src/sgml/datatype.sgml | 18 ++---
src/backend/utils/adt/xml.c | 141 ++++++++++++++++++++++++++++++++----
src/test/regress/expected/xml.out | 46 ++++++++++++
src/test/regress/expected/xml_1.out | 42 +++++++++++
src/test/regress/expected/xml_2.out | 46 ++++++++++++
src/test/regress/sql/xml.sql | 7 ++
6 files changed, 271 insertions(+), 29 deletions(-)
From | Date | Subject | |
---|---|---|---|
Next Message | Tom Lane | 2019-03-23 21:40:40 | pgsql: Remove inadequate check for duplicate "xml" PI. |
Previous Message | Peter Geoghegan | 2019-03-23 20:51:24 | pgsql: Suppress DETAIL output from an event_trigger test. |