Skip to content

Fix Issue #693 - server termination from return exists(path) #721

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

Merged
jrgemignani merged 1 commit into from
Mar 2, 2023
Merged

Fix Issue #693 - server termination from return exists(path) #721

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
96 changes: 96 additions & 0 deletions regress/expected/cypher_match.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -720,6 +720,57 @@ AS (u agtype, e agtype, v agtype);
{"id": 2814749767106561, "label": "loop", "properties": {"id": "initial"}}::vertex | {"id": 3096224743817217, "label": "self", "end_id": 2814749767106561, "start_id": 2814749767106561, "properties": {}}::edge | {"id": 2814749767106561, "label": "loop", "properties": {"id": "initial"}}::vertex
(1 row)

-- Return exists(pattern)
SELECT * FROM cypher('cypher_match',
$$MATCH (u) RETURN EXISTS((u)-[]->()) $$)
AS (exists agtype);
exists
--------
false
false
false
false
false
true
true
false
false
true
false
true
false
true
true
(15 rows)

SELECT * FROM cypher('cypher_match',
$$MATCH p=(u)-[e]->(v) RETURN EXISTS((p)) $$)
AS (exists agtype);
exists
--------
true
true
true
true
true
true
true
(7 rows)

SELECT * FROM cypher('cypher_match',
$$MATCH (u)-[e]->(v) RETURN EXISTS((u)-[e]->(v)-[e]->(u))$$)
AS (exists agtype);
exists
--------
false
false
false
false
false
false
false
(7 rows)

-- These should error
-- Bad pattern
SELECT * FROM cypher('cypher_match',
Expand Down Expand Up @@ -809,6 +860,51 @@ AS (u agtype);
{"id": 2814749767106561, "label": "loop", "properties": {"id": "initial"}}::vertex
(1 row)

-- Return exists(property)
SELECT * FROM cypher('cypher_match',
$$MATCH (u) RETURN EXISTS(u.id), properties(u) $$)
AS (exists agtype, properties agtype);
exists | properties
--------+-------------------------------------------------------------------------------------------------------------
false | {"int_key": 1, "map_key": {"key": "value"}, "list_key": [1, 2, 3], "float_key": 3.14, "string_key": "test"}
false | {"lst": [1, null, 3.14, "string", {"key": "value"}, []]}
false | {}
false | {"i": 0}
false | {"i": 1}
true | {"id": "initial"}
true | {"id": "middle"}
true | {"id": "end"}
true | {"id": "initial"}
true | {"id": "middle"}
true | {"id": "end"}
true | {"id": "initial"}
true | {"id": "middle"}
true | {"id": "end"}
true | {"id": "initial"}
(15 rows)

SELECT * FROM cypher('cypher_match',
$$MATCH (u) RETURN EXISTS(u.name), properties(u) $$)
AS (exists agtype, properties agtype);
exists | properties
--------+-------------------------------------------------------------------------------------------------------------
false | {"int_key": 1, "map_key": {"key": "value"}, "list_key": [1, 2, 3], "float_key": 3.14, "string_key": "test"}
false | {"lst": [1, null, 3.14, "string", {"key": "value"}, []]}
false | {}
false | {"i": 0}
false | {"i": 1}
false | {"id": "initial"}
false | {"id": "middle"}
false | {"id": "end"}
false | {"id": "initial"}
false | {"id": "middle"}
false | {"id": "end"}
false | {"id": "initial"}
false | {"id": "middle"}
false | {"id": "end"}
false | {"id": "initial"}
(15 rows)

-- should give an error
SELECT * FROM cypher('cypher_match',
$$MATCH (u) WHERE EXISTS(u) RETURN u$$)
Expand Down
23 changes: 23 additions & 0 deletions regress/sql/cypher_match.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -372,6 +372,20 @@ SELECT * FROM cypher('cypher_match',
$$MATCH (u)-[e]->(v) WHERE EXISTS((u)-[e]->(u)) AND EXISTS((v)-[e]->(v)) RETURN u, e, v $$)
AS (u agtype, e agtype, v agtype);

-- Return exists(pattern)

SELECT * FROM cypher('cypher_match',
$$MATCH (u) RETURN EXISTS((u)-[]->()) $$)
AS (exists agtype);

SELECT * FROM cypher('cypher_match',
$$MATCH p=(u)-[e]->(v) RETURN EXISTS((p)) $$)
AS (exists agtype);

SELECT * FROM cypher('cypher_match',
$$MATCH (u)-[e]->(v) RETURN EXISTS((u)-[e]->(v)-[e]->(u))$$)
AS (exists agtype);

-- These should error
-- Bad pattern
SELECT * FROM cypher('cypher_match',
Expand Down Expand Up @@ -410,6 +424,15 @@ SELECT * FROM cypher('cypher_match',
$$MATCH (u) WHERE EXISTS(u.id) AND EXISTS((u)-[]->(u)) RETURN u$$)
AS (u agtype);

-- Return exists(property)
SELECT * FROM cypher('cypher_match',
$$MATCH (u) RETURN EXISTS(u.id), properties(u) $$)
AS (exists agtype, properties agtype);

SELECT * FROM cypher('cypher_match',
$$MATCH (u) RETURN EXISTS(u.name), properties(u) $$)
AS (exists agtype, properties agtype);

-- should give an error
SELECT * FROM cypher('cypher_match',
$$MATCH (u) WHERE EXISTS(u) RETURN u$$)
Expand Down
1 change: 1 addition & 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 @@ -5142,6 +5142,7 @@ transform_cypher_clause_as_subquery(cypher_parsestate *cpstate,
Assert(pstate->p_expr_kind == EXPR_KIND_NONE ||
pstate->p_expr_kind == EXPR_KIND_OTHER ||
pstate->p_expr_kind == EXPR_KIND_WHERE ||
pstate->p_expr_kind == EXPR_KIND_SELECT_TARGET ||
pstate->p_expr_kind == EXPR_KIND_FROM_SUBSELECT);

/*
Expand Down