Skip to content

Fix entity-projection alias in WITH clause causing MATCH to fail #2544

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
waterWang wants to merge 1 commit into
base: master
Choose a base branch
from
+24 −7
Open

Fix entity-projection alias in WITH clause causing MATCH to fail #2544

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 13 additions & 7 deletions regress/expected/cypher_match.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2270,9 +2270,11 @@ ERROR: variable "p" already exists
LINE 1: ...cypher('cypher_match', $$ CREATE (p) WITH p MATCH p=() RETUR...
^
SELECT * FROM cypher('cypher_match', $$ CREATE p=() WITH p MATCH (p) RETURN p $$)as (p agtype);
ERROR: variable 'p' already exists
LINE 1: ...pher('cypher_match', $$ CREATE p=() WITH p MATCH (p) RETURN ...
^
p
------------------------------------------------------------------------
[{"id": 281474976710669, "label": "", "properties": {}}::vertex]::path
(1 row)

SELECT * FROM cypher('cypher_match', $$ CREATE ()-[p:knows]->() WITH p MATCH p=() RETURN p $$)as (p agtype);
ERROR: variable "p" already exists
LINE 1: ...r_match', $$ CREATE ()-[p:knows]->() WITH p MATCH p=() RETUR...
Expand All @@ -2297,7 +2299,8 @@ SELECT * FROM cypher('cypher_match', $$ MATCH (_) RETURN _ $$) as (a agtype);
{"id": 281474976710659, "label": "", "properties": {"age": 3, "name": "orphan"}}::vertex
{"id": 281474976710667, "label": "", "properties": {"name": "Dave"}}::vertex
{"id": 281474976710668, "label": "", "properties": {"name": "John"}}::vertex
(10 rows)
{"id": 281474976710669, "label": "", "properties": {}}::vertex
(11 rows)

SELECT * FROM cypher('cypher_match', $$ MATCH () MATCH (_{name: "Dave"}) RETURN 0 $$) as (a agtype);
a
Expand All @@ -2312,7 +2315,8 @@ SELECT * FROM cypher('cypher_match', $$ MATCH () MATCH (_{name: "Dave"}) RETURN
0
0
0
(10 rows)
0
(11 rows)

SELECT * FROM cypher('cypher_match', $$ MATCH () MATCH (_{name: "Dave"}) RETURN _ $$) as (a agtype);
a
Expand All @@ -2327,7 +2331,8 @@ SELECT * FROM cypher('cypher_match', $$ MATCH () MATCH (_{name: "Dave"}) RETURN
{"id": 281474976710667, "label": "", "properties": {"name": "Dave"}}::vertex
{"id": 281474976710667, "label": "", "properties": {"name": "Dave"}}::vertex
{"id": 281474976710667, "label": "", "properties": {"name": "Dave"}}::vertex
(10 rows)
{"id": 281474976710667, "label": "", "properties": {"name": "Dave"}}::vertex
(11 rows)

SELECT * FROM cypher('cypher_match', $$ MATCH (my_age_default_{name: "Dave"}) RETURN my_age_default_$$) as (a agtype);
a
Expand All @@ -2348,7 +2353,8 @@ SELECT * FROM cypher('cypher_match', $$ MATCH () MATCH (my_age_default_{name: "D
{"id": 281474976710667, "label": "", "properties": {"name": "Dave"}}::vertex
{"id": 281474976710667, "label": "", "properties": {"name": "Dave"}}::vertex
{"id": 281474976710667, "label": "", "properties": {"name": "Dave"}}::vertex
(10 rows)
{"id": 281474976710667, "label": "", "properties": {"name": "Dave"}}::vertex
(11 rows)

-- these should fail as they are prefixed with _age_default_ which is only for internal use
SELECT * FROM cypher('cypher_match', $$ MATCH (_age_default_) RETURN _age_default_ $$) as (a agtype);
Expand Down
11 changes: 11 additions & 0 deletions src/backend/parser/cypher_clause.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6962,6 +6962,17 @@ static Expr *transform_cypher_node(cypher_parsestate *cpstate,
*/
else if (te && !entity)
{
/*
* If the variable is visible as a column from a previous clause
* (e.g. WITH n AS alias0 → MATCH (alias0)), it is an alias
* projection of an existing entity. Return the column reference
* directly instead of erroring — the caller will create the
* transform_entity for it.
*/
if (previous_clause_var != NULL)
{
return (Expr *)previous_clause_var;
}
ereport(ERROR,
(errcode(ERRCODE_DUPLICATE_ALIAS),
errmsg("variable '%s' already exists", node->name),
Expand Down
Loading