git.postgresql.org Git - postgresql.git/commitdiff

git projects / postgresql.git / commitdiff

Add missing deparsing of [NO] IDENT to XMLSERIALIZE()

author Michael Paquier <michael@paquier.xyz>

2025年2月21日 08:30:56 +0000 (17:30 +0900)

committer Michael Paquier <michael@paquier.xyz>

2025年2月21日 08:30:56 +0000 (17:30 +0900)

NO INDENT is the default, and is added if no explicit indentation
flag was provided with XMLSERIALIZE().

Oversight in 483bdb2afec9.

Author: Jim Jones <jim.jones@uni-muenster.de>
Discussion: https://postgr.es/m/bebd457e-5b43-46b3-8fc6-f6a6509483ba@uni-muenster.de
Backpatch-through: 16

src/backend/utils/adt/ruleutils.c patch | blob | blame | history

src/test/regress/expected/xml.out patch | blob | blame | history

src/test/regress/expected/xml_1.out patch | blob | blame | history

src/test/regress/expected/xml_2.out patch | blob | blame | history

src/test/regress/sql/xml.sql patch | blob | blame | history

diff --git a/src/backend/utils/adt/ruleutils.c b/src/backend/utils/adt/ruleutils.c

index 54dad975553d2a6614a611c7dd4eedb81f22ea80..d11a8a20eea13b84b975576eb7466178064bd112 100644 (file)

--- a/src/backend/utils/adt/ruleutils.c

+++ b/src/backend/utils/adt/ruleutils.c

@@ -10142,9 +10142,16 @@ get_rule_expr(Node *node, deparse_context *context,

}

if (xexpr->op == IS_XMLSERIALIZE)

+ {

appendStringInfo(buf, " AS %s",

format_type_with_typemod(xexpr->type,

xexpr->typmod));

+ if (xexpr->indent)

+ appendStringInfoString(buf, " INDENT");

+ else

+ appendStringInfoString(buf, " NO INDENT");

+ }

if (xexpr->op == IS_DOCUMENT)

appendStringInfoString(buf, " IS DOCUMENT");

else

diff --git a/src/test/regress/expected/xml.out b/src/test/regress/expected/xml.out

index 2e9616acda1bc3d92497bbe5b89b6b21e8c0954f..bcc743f485180da246e70c09acc0e2f4a7ccfbaa 100644 (file)

--- a/src/test/regress/expected/xml.out

+++ b/src/test/regress/expected/xml.out

@@ -822,21 +822,25 @@ CREATE VIEW xmlview6 AS SELECT xmlpi(name foo, 'bar');

CREATE VIEW xmlview7 AS SELECT xmlroot(xml '<foo/>', version no value, standalone yes);

CREATE VIEW xmlview8 AS SELECT xmlserialize(content 'good' as char(10));

CREATE VIEW xmlview9 AS SELECT xmlserialize(content 'good' as text);

+CREATE VIEW xmlview10 AS SELECT xmlserialize(document '<foo><bar>42</bar></foo>' AS text indent);

+CREATE VIEW xmlview11 AS SELECT xmlserialize(document '<foo><bar>42</bar></foo>' AS character varying no indent);

SELECT table_name, view_definition FROM information_schema.views

WHERE table_name LIKE 'xmlview%' ORDER BY 1;

- table_name | view_definition

-------------+------------------------------------------------------------------------------------------------------------

+ table_name | view_definition

+------------+---------------------------------------------------------------------------------------------------------------------------------------

xmlview1 | SELECT xmlcomment('test'::text) AS xmlcomment;

+ xmlview10 | SELECT XMLSERIALIZE(DOCUMENT '<foo><bar>42</bar></foo>'::xml AS text INDENT) AS "xmlserialize";

+ xmlview11 | SELECT (XMLSERIALIZE(DOCUMENT '<foo><bar>42</bar></foo>'::xml AS character varying NO INDENT))::character varying AS "xmlserialize";

xmlview2 | SELECT XMLCONCAT('hello'::xml, 'you'::xml) AS "xmlconcat";

xmlview3 | SELECT XMLELEMENT(NAME element, XMLATTRIBUTES(1 AS ":one:", 'deuce' AS two), 'content&') AS "xmlelement";

- xmlview4 | SELECT XMLELEMENT(NAME employee, XMLFOREST(name AS name, age AS age, salary AS pay)) AS "xmlelement" +

+ xmlview4 | SELECT XMLELEMENT(NAME employee, XMLFOREST(name AS name, age AS age, salary AS pay)) AS "xmlelement" +

| FROM emp;

xmlview5 | SELECT XMLPARSE(CONTENT '<abc>x</abc>'::text STRIP WHITESPACE) AS "xmlparse";

xmlview6 | SELECT XMLPI(NAME foo, 'bar'::text) AS "xmlpi";

xmlview7 | SELECT XMLROOT('<foo/>'::xml, VERSION NO VALUE, STANDALONE YES) AS "xmlroot";

- xmlview8 | SELECT (XMLSERIALIZE(CONTENT 'good'::xml AS character(10)))::character(10) AS "xmlserialize";

- xmlview9 | SELECT XMLSERIALIZE(CONTENT 'good'::xml AS text) AS "xmlserialize";

-(9 rows)

+ xmlview8 | SELECT (XMLSERIALIZE(CONTENT 'good'::xml AS character(10) NO INDENT))::character(10) AS "xmlserialize";

+ xmlview9 | SELECT XMLSERIALIZE(CONTENT 'good'::xml AS text NO INDENT) AS "xmlserialize";

+(11 rows)

-- Text XPath expressions evaluation

SELECT xpath('/value', data) FROM xmltest;

diff --git a/src/test/regress/expected/xml_1.out b/src/test/regress/expected/xml_1.out

index 7505a1407757fa92274127f8465f4eacd16db45b..a1c5d314171f661ec84549991952b2cf39a6ea82 100644 (file)

--- a/src/test/regress/expected/xml_1.out

+++ b/src/test/regress/expected/xml_1.out

@@ -583,6 +583,16 @@ ERROR: unsupported XML feature

LINE 1: ...EATE VIEW xmlview9 AS SELECT xmlserialize(content 'good' as ...

DETAIL: This functionality requires the server to be built with libxml support.

+CREATE VIEW xmlview10 AS SELECT xmlserialize(document '<foo><bar>42</bar></foo>' AS text indent);

+ERROR: unsupported XML feature

+LINE 1: ...TE VIEW xmlview10 AS SELECT xmlserialize(document '<foo><bar...

+ ^

+DETAIL: This functionality requires the server to be built with libxml support.

+CREATE VIEW xmlview11 AS SELECT xmlserialize(document '<foo><bar>42</bar></foo>' AS character varying no indent);

+ERROR: unsupported XML feature

+LINE 1: ...TE VIEW xmlview11 AS SELECT xmlserialize(document '<foo><bar...

+ ^

+DETAIL: This functionality requires the server to be built with libxml support.

SELECT table_name, view_definition FROM information_schema.views

WHERE table_name LIKE 'xmlview%' ORDER BY 1;

table_name | view_definition

diff --git a/src/test/regress/expected/xml_2.out b/src/test/regress/expected/xml_2.out

index c07ed2b269c58214600226c23e91da87e2aadf7d..045641dae6491da7477db4a1df74efea57e3a6e9 100644 (file)

--- a/src/test/regress/expected/xml_2.out

+++ b/src/test/regress/expected/xml_2.out

@@ -808,21 +808,25 @@ CREATE VIEW xmlview6 AS SELECT xmlpi(name foo, 'bar');

CREATE VIEW xmlview7 AS SELECT xmlroot(xml '<foo/>', version no value, standalone yes);

CREATE VIEW xmlview8 AS SELECT xmlserialize(content 'good' as char(10));

CREATE VIEW xmlview9 AS SELECT xmlserialize(content 'good' as text);

+CREATE VIEW xmlview10 AS SELECT xmlserialize(document '<foo><bar>42</bar></foo>' AS text indent);

+CREATE VIEW xmlview11 AS SELECT xmlserialize(document '<foo><bar>42</bar></foo>' AS character varying no indent);

SELECT table_name, view_definition FROM information_schema.views

WHERE table_name LIKE 'xmlview%' ORDER BY 1;

- table_name | view_definition

-------------+------------------------------------------------------------------------------------------------------------

+ table_name | view_definition

+------------+---------------------------------------------------------------------------------------------------------------------------------------

xmlview1 | SELECT xmlcomment('test'::text) AS xmlcomment;

+ xmlview10 | SELECT XMLSERIALIZE(DOCUMENT '<foo><bar>42</bar></foo>'::xml AS text INDENT) AS "xmlserialize";

+ xmlview11 | SELECT (XMLSERIALIZE(DOCUMENT '<foo><bar>42</bar></foo>'::xml AS character varying NO INDENT))::character varying AS "xmlserialize";

xmlview2 | SELECT XMLCONCAT('hello'::xml, 'you'::xml) AS "xmlconcat";

xmlview3 | SELECT XMLELEMENT(NAME element, XMLATTRIBUTES(1 AS ":one:", 'deuce' AS two), 'content&') AS "xmlelement";

- xmlview4 | SELECT XMLELEMENT(NAME employee, XMLFOREST(name AS name, age AS age, salary AS pay)) AS "xmlelement" +

+ xmlview4 | SELECT XMLELEMENT(NAME employee, XMLFOREST(name AS name, age AS age, salary AS pay)) AS "xmlelement" +

| FROM emp;

xmlview5 | SELECT XMLPARSE(CONTENT '<abc>x</abc>'::text STRIP WHITESPACE) AS "xmlparse";

xmlview6 | SELECT XMLPI(NAME foo, 'bar'::text) AS "xmlpi";

xmlview7 | SELECT XMLROOT('<foo/>'::xml, VERSION NO VALUE, STANDALONE YES) AS "xmlroot";

- xmlview8 | SELECT (XMLSERIALIZE(CONTENT 'good'::xml AS character(10)))::character(10) AS "xmlserialize";

- xmlview9 | SELECT XMLSERIALIZE(CONTENT 'good'::xml AS text) AS "xmlserialize";

-(9 rows)

+ xmlview8 | SELECT (XMLSERIALIZE(CONTENT 'good'::xml AS character(10) NO INDENT))::character(10) AS "xmlserialize";

+ xmlview9 | SELECT XMLSERIALIZE(CONTENT 'good'::xml AS text NO INDENT) AS "xmlserialize";

+(11 rows)

-- Text XPath expressions evaluation

SELECT xpath('/value', data) FROM xmltest;

diff --git a/src/test/regress/sql/xml.sql b/src/test/regress/sql/xml.sql

index bac0388ac11c2f3608d406f6cbfe7c4aa8dd737a..4c3520ce8980f71fddefbfd42ac29b1ac4b96b82 100644 (file)

--- a/src/test/regress/sql/xml.sql

+++ b/src/test/regress/sql/xml.sql

@@ -219,6 +219,8 @@ CREATE VIEW xmlview6 AS SELECT xmlpi(name foo, 'bar');

CREATE VIEW xmlview7 AS SELECT xmlroot(xml '<foo/>', version no value, standalone yes);

CREATE VIEW xmlview8 AS SELECT xmlserialize(content 'good' as char(10));

CREATE VIEW xmlview9 AS SELECT xmlserialize(content 'good' as text);

+CREATE VIEW xmlview10 AS SELECT xmlserialize(document '<foo><bar>42</bar></foo>' AS text indent);

+CREATE VIEW xmlview11 AS SELECT xmlserialize(document '<foo><bar>42</bar></foo>' AS character varying no indent);

SELECT table_name, view_definition FROM information_schema.views

WHERE table_name LIKE 'xmlview%' ORDER BY 1;

This is the main PostgreSQL git repository.

RSS Atom