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

git projects / postgresql.git / commitdiff

author Richard Guo <rguo@postgresql.org>

2025年5月15日 08:09:04 +0000 (17:09 +0900)

committer Richard Guo <rguo@postgresql.org>

2025年5月15日 08:09:04 +0000 (17:09 +0900)

In an XMLTABLE expression, columns can be marked NOT NULL, and the
parser internally fabricates an option named "is_not_null" to
represent this. However, the parser also allows users to specify
arbitrary option names. This creates a conflict: a user can
explicitly use "is_not_null" as an option name and assign it a
non-Boolean value, which violates internal assumptions and triggers an
assertion failure.

To fix, this patch checks whether a user-supplied name collides with
the internally reserved option name and raises an error if so.
Additionally, the internal name is renamed to "__pg__is_not_null" to
further reduce the risk of collision with user-defined names.

Reported-by: Евгений Горбанев <gorbanyoves@basealt.ru>
Author: Richard Guo <guofenglinux@gmail.com>
Reviewed-by: Alvaro Herrera <alvherre@kurilemu.de>
Discussion: https://postgr.es/m/6bac9886-65bf-4cec-96bd-e304159f28db@basealt.ru
Backpatch-through: 15

src/backend/parser/gram.y 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/parser/gram.y b/src/backend/parser/gram.y

index 3c4268b271a4fae76e307e5ce19ecc1778f4f4e8..0b5652071d1194cd339402bcc2f093556418fe95 100644 (file)

--- a/src/backend/parser/gram.y

+++ b/src/backend/parser/gram.y

@@ -14230,7 +14230,7 @@ xmltable_column_el:

parser_errposition(defel->location)));

fc->colexpr = defel->arg;

}

- else if (strcmp(defel->defname, "is_not_null") == 0)

+ else if (strcmp(defel->defname, "__pg__is_not_null") == 0)

{

if (nullability_seen)

ereport(ERROR,

@@ -14273,13 +14273,20 @@ xmltable_column_option_list:

xmltable_column_option_el:

IDENT b_expr

- { $$ = makeDefElem(1,ドル 2,ドル @1); }

+ {

+ if (strcmp(1,ドル "__pg__is_not_null") == 0)

+ ereport(ERROR,

+ (errcode(ERRCODE_SYNTAX_ERROR),

+ errmsg("option name \"%s\" cannot be used in XMLTABLE", 1ドル),

+ parser_errposition(@1)));

+ $$ = makeDefElem(1,ドル 2,ドル @1);

+ }

| DEFAULT b_expr

{ $$ = makeDefElem("default", 2,ドル @1); }

| NOT NULL_P

- { $$ = makeDefElem("is_not_null", (Node *) makeBoolean(true), @1); }

+ { $$ = makeDefElem("__pg__is_not_null", (Node *) makeBoolean(true), @1); }

| NULL_P

- { $$ = makeDefElem("is_not_null", (Node *) makeBoolean(false), @1); }

+ { $$ = makeDefElem("__pg__is_not_null", (Node *) makeBoolean(false), @1); }

| PATH b_expr

{ $$ = makeDefElem("path", 2,ドル @1); }

;

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

index bcc743f485180da246e70c09acc0e2f4a7ccfbaa..103a22a3b1d3c4cec04b4756f6f20b729ec73cd4 100644 (file)

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

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

@@ -1373,6 +1373,10 @@ EXPLAIN (COSTS OFF, VERBOSE) SELECT * FROM xmltableview1;

-- errors

SELECT * FROM XMLTABLE (ROW () PASSING null COLUMNS v1 timestamp) AS f (v1, v2);

ERROR: XMLTABLE function has 1 columns available but 2 columns specified

+SELECT * FROM XMLTABLE (ROW () PASSING null COLUMNS v1 timestamp __pg__is_not_null 1) AS f (v1);

+ERROR: option name "__pg__is_not_null" cannot be used in XMLTABLE

+LINE 1: ...MLTABLE (ROW () PASSING null COLUMNS v1 timestamp __pg__is_n...

+ ^

-- XMLNAMESPACES tests

SELECT * FROM XMLTABLE(XMLNAMESPACES('http://x.y' AS zz),

'/zz:rows/zz:row'

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

index a1c5d314171f661ec84549991952b2cf39a6ea82..73c411118a390a83f36596c6c8e079bb63e2d2e0 100644 (file)

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

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

@@ -1047,6 +1047,10 @@ EXPLAIN (COSTS OFF, VERBOSE) SELECT * FROM xmltableview1;

-- errors

SELECT * FROM XMLTABLE (ROW () PASSING null COLUMNS v1 timestamp) AS f (v1, v2);

ERROR: XMLTABLE function has 1 columns available but 2 columns specified

+SELECT * FROM XMLTABLE (ROW () PASSING null COLUMNS v1 timestamp __pg__is_not_null 1) AS f (v1);

+ERROR: option name "__pg__is_not_null" cannot be used in XMLTABLE

+LINE 1: ...MLTABLE (ROW () PASSING null COLUMNS v1 timestamp __pg__is_n...

+ ^

-- XMLNAMESPACES tests

SELECT * FROM XMLTABLE(XMLNAMESPACES('http://x.y' AS zz),

'/zz:rows/zz:row'

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

index 045641dae6491da7477db4a1df74efea57e3a6e9..a85d95358d9012c8c0715d72a0ddf1999bd43a13 100644 (file)

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

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

@@ -1359,6 +1359,10 @@ EXPLAIN (COSTS OFF, VERBOSE) SELECT * FROM xmltableview1;

-- errors

SELECT * FROM XMLTABLE (ROW () PASSING null COLUMNS v1 timestamp) AS f (v1, v2);

ERROR: XMLTABLE function has 1 columns available but 2 columns specified

+SELECT * FROM XMLTABLE (ROW () PASSING null COLUMNS v1 timestamp __pg__is_not_null 1) AS f (v1);

+ERROR: option name "__pg__is_not_null" cannot be used in XMLTABLE

+LINE 1: ...MLTABLE (ROW () PASSING null COLUMNS v1 timestamp __pg__is_n...

+ ^

-- XMLNAMESPACES tests

SELECT * FROM XMLTABLE(XMLNAMESPACES('http://x.y' AS zz),

'/zz:rows/zz:row'

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

index 4c3520ce8980f71fddefbfd42ac29b1ac4b96b82..0ea4f508837cf660972e7351fa95371b47088e6f 100644 (file)

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

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

@@ -435,6 +435,8 @@ EXPLAIN (COSTS OFF, VERBOSE) SELECT * FROM xmltableview1;

-- errors

SELECT * FROM XMLTABLE (ROW () PASSING null COLUMNS v1 timestamp) AS f (v1, v2);

+SELECT * FROM XMLTABLE (ROW () PASSING null COLUMNS v1 timestamp __pg__is_not_null 1) AS f (v1);

-- XMLNAMESPACES tests

SELECT * FROM XMLTABLE(XMLNAMESPACES('http://x.y' AS zz),

'/zz:rows/zz:row'

This is the main PostgreSQL git repository.

RSS Atom