database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2026-10-23 13:29:09 +03:00
Code Activity

Fix missing space before WHERE in GRAPH_TABLE deparse

Browse Source 
get_graph_pattern_def() emitted the pattern-level WHERE keyword as
"WHERE " with no leading space, so reverse-parsing produced output
like "(o IS orders)WHERE (...)".  The element-level WHERE deparse in
get_path_pattern_expr_def() already prepends a separating space; the
pattern-level branch was inconsistent with it.  Emit " WHERE " to
match.

The output still re-parses to the same tree, so this is cosmetic.

For test coverage, add a whole-pattern WHERE clause to the existing
customers_us view, which is already reverse-parsed with
pg_get_viewdef().

Author: Dhruv Chauhan <chauhandhruv351@gmail.com>
Reviewed-by: Ashutosh Bapat <ashutosh.bapat.oss@gmail.com>
Discussion: https://www.postgresql.org/message-id/flat/CANWwWcpHb0h7tg6otRnL-FV83jwQpAiyw1bhvv8T78kpwZ-0ow%40mail.gmail.com
This commit is contained in:
Peter Eisentraut
2026-08-03 10:14:30 +02:00
parent 0d99579320
commit 780fa49746
3 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/backend/utils/adt/ruleutils.c
View File

@@ -8135,7 +8135,7 @@ get_graph_pattern_def(GraphPattern *graph_pattern, deparse_context *context)
if (graph_pattern->whereClause) if (graph_pattern->whereClause)
{ {
appendStringInfoString(buf, "WHERE "); appendStringInfoString(buf, " WHERE ");
get_rule_expr(graph_pattern->whereClause, context, false); get_rule_expr(graph_pattern->whereClause, context, false);
} }
} }

21
src/test/regress/expected/graph_table.out
View File

@@ -965,13 +965,14 @@ SELECT * FROM GRAPH_TABLE (g4 MATCH (s WHERE s.id = 3)-[e]-(d) COLUMNS (s.val, e
-- GRAPH_TABLE in views -- GRAPH_TABLE in views
-- The query in the view definition is intentionally complex to test one view with many -- The query in the view definition is intentionally complex to test one view with many
-- features like label disjunction, lateral references, WHERE clauses in graph -- features like label disjunction, lateral references, WHERE clauses on graph
-- patterns. -- pattern elements as well as on the whole graph pattern.
CREATE VIEW customers_us AS CREATE VIEW customers_us AS
SELECT g.* FROM x1, SELECT g.* FROM x1,
GRAPH_TABLE (myshop MATCH (c IS customers WHERE c.address = 'US' AND c.customer_id = x1.a) GRAPH_TABLE (myshop MATCH (c IS customers WHERE c.address = 'US' AND c.customer_id = x1.a)
-[IS customer_orders | customer_wishlists ]-> -[IS customer_orders | customer_wishlists ]->
(l IS orders | wishlists)-[ IS list_items]->(p IS products) (l IS orders | wishlists)-[ IS list_items]->(p IS products)
WHERE p.price > 0
COLUMNS (c.name AS customer_name, p.name AS product_name, p.price, x1.a AS a)) g COLUMNS (c.name AS customer_name, p.name AS product_name, p.price, x1.a AS a)) g
ORDER BY customer_name, product_name; ORDER BY customer_name, product_name;
-- Dropping properties or labels used by a view is not allowed -- Dropping properties or labels used by a view is not allowed
@@ -993,14 +994,14 @@ DETAIL: view customers_us depends on property price of property graph myshop
HINT: Use DROP ... CASCADE to drop the dependent objects too. HINT: Use DROP ... CASCADE to drop the dependent objects too.
-- ruleutils reverse parsing -- ruleutils reverse parsing
SELECT pg_get_viewdef('customers_us'::regclass); SELECT pg_get_viewdef('customers_us'::regclass);
pg_get_viewdef pg_get_viewdef
---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
SELECT g.customer_name, + SELECT g.customer_name, +
g.product_name, + g.product_name, +
g.price, + g.price, +
g.a + g.a +
FROM x1, + FROM x1, +
GRAPH_TABLE (myshop MATCH (c IS customers WHERE (((c.address)::text = 'US'::text) AND (c.customer_id = x1.a)))-[IS customer_orders|customer_wishlists]->(l IS orders|wishlists)-[IS list_items]->(p IS products) COLUMNS (c.name AS customer_name, p.name AS product_name, p.price AS price, x1.a AS a)) g+ GRAPH_TABLE (myshop MATCH (c IS customers WHERE (((c.address)::text = 'US'::text) AND (c.customer_id = x1.a)))-[IS customer_orders|customer_wishlists]->(l IS orders|wishlists)-[IS list_items]->(p IS products) WHERE (p.price > (0)::numeric) COLUMNS (c.name AS customer_name, p.name AS product_name, p.price AS price, x1.a AS a)) g+
ORDER BY g.customer_name, g.product_name; ORDER BY g.customer_name, g.product_name;
(1 row) (1 row)

5
src/test/regress/sql/graph_table.sql
View File

@@ -539,13 +539,14 @@ SELECT * FROM GRAPH_TABLE (g4 MATCH (s WHERE s.id = 3)-[e]-(d) COLUMNS (s.val, e
-- GRAPH_TABLE in views -- GRAPH_TABLE in views
-- The query in the view definition is intentionally complex to test one view with many -- The query in the view definition is intentionally complex to test one view with many
-- features like label disjunction, lateral references, WHERE clauses in graph -- features like label disjunction, lateral references, WHERE clauses on graph
-- patterns. -- pattern elements as well as on the whole graph pattern.
CREATE VIEW customers_us AS CREATE VIEW customers_us AS
SELECT g.* FROM x1, SELECT g.* FROM x1,
GRAPH_TABLE (myshop MATCH (c IS customers WHERE c.address = 'US' AND c.customer_id = x1.a) GRAPH_TABLE (myshop MATCH (c IS customers WHERE c.address = 'US' AND c.customer_id = x1.a)
-[IS customer_orders | customer_wishlists ]-> -[IS customer_orders | customer_wishlists ]->
(l IS orders | wishlists)-[ IS list_items]->(p IS products) (l IS orders | wishlists)-[ IS list_items]->(p IS products)
WHERE p.price > 0
COLUMNS (c.name AS customer_name, p.name AS product_name, p.price, x1.a AS a)) g COLUMNS (c.name AS customer_name, p.name AS product_name, p.price, x1.a AS a)) g
ORDER BY customer_name, product_name; ORDER BY customer_name, product_name;
-- Dropping properties or labels used by a view is not allowed -- Dropping properties or labels used by a view is not allowed