Skip to content

cypher_with: add ORDER BY to non-deterministic RETURN queries #2436

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
jrgemignani wants to merge 1 commit into
base: master
Choose a base branch
from
+30 −8
Open

cypher_with: add ORDER BY to non-deterministic RETURN queries #2436

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
25 changes: 18 additions & 7 deletions regress/expected/cypher_with.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,13 +52,14 @@ SELECT * FROM cypher('cypher_with', $$
MATCH (n)-[e]->(m)
WITH n,e,m
RETURN n,e,m
ORDER BY id(n) ASC, id(e) ASC, id(m) ASC
$$) AS (N1 agtype, edge agtype, N2 agtype);
n1 | edge | n2
--------------------------------------------------------------------------------------------+----------------------------------------------------------------------------------------------------------------------------+--------------------------------------------------------------------------------------------
{"id": 281474976710657, "label": "", "properties": {"age": 36, "name": "Andres"}}::vertex | {"id": 844424930131969, "label": "BLOCKS", "end_id": 281474976710658, "start_id": 281474976710657, "properties": {}}::edge | {"id": 281474976710658, "label": "", "properties": {"age": 25, "name": "Caesar"}}::vertex
{"id": 281474976710659, "label": "", "properties": {"age": 55, "name": "Bossman"}}::vertex | {"id": 844424930131970, "label": "BLOCKS", "end_id": 281474976710660, "start_id": 281474976710659, "properties": {}}::edge | {"id": 281474976710660, "label": "", "properties": {"age": 35, "name": "David"}}::vertex
{"id": 281474976710657, "label": "", "properties": {"age": 36, "name": "Andres"}}::vertex | {"id": 1125899906842625, "label": "KNOWS", "end_id": 281474976710659, "start_id": 281474976710657, "properties": {}}::edge | {"id": 281474976710659, "label": "", "properties": {"age": 55, "name": "Bossman"}}::vertex
{"id": 281474976710658, "label": "", "properties": {"age": 25, "name": "Caesar"}}::vertex | {"id": 1125899906842626, "label": "KNOWS", "end_id": 281474976710661, "start_id": 281474976710658, "properties": {}}::edge | {"id": 281474976710661, "label": "", "properties": {"age": 37, "name": "George"}}::vertex
{"id": 281474976710659, "label": "", "properties": {"age": 55, "name": "Bossman"}}::vertex | {"id": 844424930131970, "label": "BLOCKS", "end_id": 281474976710660, "start_id": 281474976710659, "properties": {}}::edge | {"id": 281474976710660, "label": "", "properties": {"age": 35, "name": "David"}}::vertex
{"id": 281474976710659, "label": "", "properties": {"age": 55, "name": "Bossman"}}::vertex | {"id": 1125899906842627, "label": "KNOWS", "end_id": 281474976710661, "start_id": 281474976710659, "properties": {}}::edge | {"id": 281474976710661, "label": "", "properties": {"age": 37, "name": "George"}}::vertex
{"id": 281474976710660, "label": "", "properties": {"age": 35, "name": "David"}}::vertex | {"id": 1125899906842628, "label": "KNOWS", "end_id": 281474976710657, "start_id": 281474976710660, "properties": {}}::edge | {"id": 281474976710657, "label": "", "properties": {"age": 36, "name": "Andres"}}::vertex
(6 rows)
Expand All @@ -68,6 +69,7 @@ SELECT * FROM cypher('cypher_with', $$
MATCH (n)-[e]->(m)
WITH n.name AS n1, e as edge, m.name as n2
RETURN n1,label(edge),n2
ORDER BY id(edge) ASC
$$) AS (start_node agtype,edge agtype, end_node agtype);
start_node | edge | end_node
------------+----------+-----------
Expand All @@ -83,13 +85,14 @@ SELECT * FROM cypher('cypher_with',$$
MATCH (person)-[r]->(otherPerson)
WITH *, type(r) AS connectionType
RETURN person.name, connectionType, otherPerson.name
ORDER BY id(person) ASC, id(otherPerson) ASC
$$) AS (start_node agtype, connection agtype, end_node agtype);
start_node | connection | end_node
------------+------------+-----------
"Andres" | "BLOCKS" | "Caesar"
"Bossman" | "BLOCKS" | "David"
"Andres" | "KNOWS" | "Bossman"
"Caesar" | "KNOWS" | "George"
"Bossman" | "BLOCKS" | "David"
"Bossman" | "KNOWS" | "George"
"David" | "KNOWS" | "Andres"
(6 rows)
Expand All @@ -109,6 +112,7 @@ MATCH (george {name: 'George'})<-[]-(otherPerson)
WITH otherPerson, toUpper(otherPerson.name) AS upperCaseName
WHERE upperCaseName STARTS WITH 'C'
RETURN otherPerson.name
ORDER BY id(otherPerson) ASC
$$) as (name agtype);
name
----------
Expand All @@ -120,6 +124,7 @@ SELECT * FROM cypher('cypher_with', $$
WITH otherPerson, count(*) AS foaf
WHERE foaf > 1
RETURN otherPerson.name
ORDER BY id(otherPerson) ASC
$$) as (name agtype);
name
----------
Expand All @@ -131,15 +136,16 @@ SELECT * FROM cypher('cypher_with', $$
WITH p, length(p) AS path_length
WHERE path_length > 1
RETURN p
ORDER BY p ASC
$$) AS (pattern agtype);
pattern
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
[{"id": 281474976710657, "label": "_ag_label_vertex", "properties": {"age": 36, "name": "Andres"}}::vertex, {"id": 1125899906842625, "label": "KNOWS", "end_id": 281474976710659, "start_id": 281474976710657, "properties": {}}::edge, {"id": 281474976710659, "label": "_ag_label_vertex", "properties": {"age": 55, "name": "Bossman"}}::vertex, {"id": 1125899906842627, "label": "KNOWS", "end_id": 281474976710661, "start_id": 281474976710659, "properties": {}}::edge, {"id": 281474976710661, "label": "_ag_label_vertex", "properties": {"age": 37, "name": "George"}}::vertex]::path
[{"id": 281474976710657, "label": "_ag_label_vertex", "properties": {"age": 36, "name": "Andres"}}::vertex, {"id": 1125899906842625, "label": "KNOWS", "end_id": 281474976710659, "start_id": 281474976710657, "properties": {}}::edge, {"id": 281474976710659, "label": "_ag_label_vertex", "properties": {"age": 55, "name": "Bossman"}}::vertex, {"id": 844424930131970, "label": "BLOCKS", "end_id": 281474976710660, "start_id": 281474976710659, "properties": {}}::edge, {"id": 281474976710660, "label": "_ag_label_vertex", "properties": {"age": 35, "name": "David"}}::vertex]::path
[{"id": 281474976710657, "label": "_ag_label_vertex", "properties": {"age": 36, "name": "Andres"}}::vertex, {"id": 844424930131969, "label": "BLOCKS", "end_id": 281474976710658, "start_id": 281474976710657, "properties": {}}::edge, {"id": 281474976710658, "label": "_ag_label_vertex", "properties": {"age": 25, "name": "Caesar"}}::vertex, {"id": 1125899906842626, "label": "KNOWS", "end_id": 281474976710661, "start_id": 281474976710658, "properties": {}}::edge, {"id": 281474976710661, "label": "_ag_label_vertex", "properties": {"age": 37, "name": "George"}}::vertex]::path
[{"id": 281474976710657, "label": "_ag_label_vertex", "properties": {"age": 36, "name": "Andres"}}::vertex, {"id": 1125899906842625, "label": "KNOWS", "end_id": 281474976710659, "start_id": 281474976710657, "properties": {}}::edge, {"id": 281474976710659, "label": "_ag_label_vertex", "properties": {"age": 55, "name": "Bossman"}}::vertex, {"id": 844424930131970, "label": "BLOCKS", "end_id": 281474976710660, "start_id": 281474976710659, "properties": {}}::edge, {"id": 281474976710660, "label": "_ag_label_vertex", "properties": {"age": 35, "name": "David"}}::vertex]::path
[{"id": 281474976710657, "label": "_ag_label_vertex", "properties": {"age": 36, "name": "Andres"}}::vertex, {"id": 1125899906842625, "label": "KNOWS", "end_id": 281474976710659, "start_id": 281474976710657, "properties": {}}::edge, {"id": 281474976710659, "label": "_ag_label_vertex", "properties": {"age": 55, "name": "Bossman"}}::vertex, {"id": 1125899906842627, "label": "KNOWS", "end_id": 281474976710661, "start_id": 281474976710659, "properties": {}}::edge, {"id": 281474976710661, "label": "_ag_label_vertex", "properties": {"age": 37, "name": "George"}}::vertex]::path
[{"id": 281474976710659, "label": "_ag_label_vertex", "properties": {"age": 55, "name": "Bossman"}}::vertex, {"id": 844424930131970, "label": "BLOCKS", "end_id": 281474976710660, "start_id": 281474976710659, "properties": {}}::edge, {"id": 281474976710660, "label": "_ag_label_vertex", "properties": {"age": 35, "name": "David"}}::vertex, {"id": 1125899906842628, "label": "KNOWS", "end_id": 281474976710657, "start_id": 281474976710660, "properties": {}}::edge, {"id": 281474976710657, "label": "_ag_label_vertex", "properties": {"age": 36, "name": "Andres"}}::vertex]::path
[{"id": 281474976710660, "label": "_ag_label_vertex", "properties": {"age": 35, "name": "David"}}::vertex, {"id": 1125899906842628, "label": "KNOWS", "end_id": 281474976710657, "start_id": 281474976710660, "properties": {}}::edge, {"id": 281474976710657, "label": "_ag_label_vertex", "properties": {"age": 36, "name": "Andres"}}::vertex, {"id": 1125899906842625, "label": "KNOWS", "end_id": 281474976710659, "start_id": 281474976710657, "properties": {}}::edge, {"id": 281474976710659, "label": "_ag_label_vertex", "properties": {"age": 55, "name": "Bossman"}}::vertex]::path
[{"id": 281474976710660, "label": "_ag_label_vertex", "properties": {"age": 35, "name": "David"}}::vertex, {"id": 1125899906842628, "label": "KNOWS", "end_id": 281474976710657, "start_id": 281474976710660, "properties": {}}::edge, {"id": 281474976710657, "label": "_ag_label_vertex", "properties": {"age": 36, "name": "Andres"}}::vertex, {"id": 844424930131969, "label": "BLOCKS", "end_id": 281474976710658, "start_id": 281474976710657, "properties": {}}::edge, {"id": 281474976710658, "label": "_ag_label_vertex", "properties": {"age": 25, "name": "Caesar"}}::vertex]::path
[{"id": 281474976710660, "label": "_ag_label_vertex", "properties": {"age": 35, "name": "David"}}::vertex, {"id": 1125899906842628, "label": "KNOWS", "end_id": 281474976710657, "start_id": 281474976710660, "properties": {}}::edge, {"id": 281474976710657, "label": "_ag_label_vertex", "properties": {"age": 36, "name": "Andres"}}::vertex, {"id": 1125899906842625, "label": "KNOWS", "end_id": 281474976710659, "start_id": 281474976710657, "properties": {}}::edge, {"id": 281474976710659, "label": "_ag_label_vertex", "properties": {"age": 55, "name": "Bossman"}}::vertex]::path
(6 rows)

-- MATCH/WHERE with WITH/WHERE
Expand All @@ -149,6 +155,7 @@ SELECT * FROM cypher('cypher_with', $$
WITH *
WHERE m.name = 'Andres'
RETURN m.name,label(e),b.name
ORDER BY id(m) ASC, id(e) ASC, id(b) ASC
$$) AS (N1 agtype, edge agtype, N2 agtype);
n1 | edge | n2
----------+---------+-----------
Expand Down Expand Up @@ -201,9 +208,10 @@ SELECT * FROM cypher('cypher_with', $$
MATCH (n)-[e]->(m)
WITH n, e, m
WHERE label(e) = 'KNOWS'
WITH n.name as n1, label(e) as edge, m.name as n2
WITH id(e) AS eid, n.name as n1, label(e) as edge, m.name as n2
WHERE n1 = 'Andres'
RETURN n1,edge,n2
ORDER BY eid ASC
$$) AS (N1 agtype, edge agtype, N2 agtype);
n1 | edge | n2
----------+---------+-----------
Expand All @@ -217,6 +225,7 @@ SELECT * FROM cypher('cypher_with', $$
WITH x
LIMIT 5
RETURN x
ORDER BY x ASC
$$) as (name agtype);
name
------
Expand All @@ -233,11 +242,12 @@ SELECT * FROM cypher('cypher_with', $$
WITH m as start_node, b as end_node
WHERE end_node.name = 'George'
RETURN id(start_node),start_node.name,id(end_node),end_node.name
ORDER BY id(start_node) ASC, id(end_node) ASC
$$) AS (id1 agtype, name1 agtype, id2 agtype, name2 agtype);
id1 | name1 | id2 | name2
-----------------+-----------+-----------------+----------
281474976710659 | "Bossman" | 281474976710661 | "George"
281474976710658 | "Caesar" | 281474976710661 | "George"
281474976710659 | "Bossman" | 281474976710661 | "George"
(2 rows)

-- Expression item must be aliased.
Expand Down Expand Up @@ -471,6 +481,7 @@ SELECT * FROM cypher('with_accessor_opt', $$
MATCH (n:Person)
WITH n as m
RETURN m
ORDER BY id(m) ASC
$$) AS (n vertex);
n
---------------------------------------------------------------------
Expand Down
13 changes: 12 additions & 1 deletion regress/sql/cypher_with.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ SELECT * FROM cypher('cypher_with', $$
MATCH (n)-[e]->(m)
WITH n,e,m
RETURN n,e,m
ORDER BY id(n) ASC, id(e) ASC, id(m) ASC
$$) AS (N1 agtype, edge agtype, N2 agtype);

-- WITH/AS
Expand All @@ -55,12 +56,14 @@ SELECT * FROM cypher('cypher_with', $$
MATCH (n)-[e]->(m)
WITH n.name AS n1, e as edge, m.name as n2
RETURN n1,label(edge),n2
ORDER BY id(edge) ASC
$$) AS (start_node agtype,edge agtype, end_node agtype);

SELECT * FROM cypher('cypher_with',$$
MATCH (person)-[r]->(otherPerson)
WITH *, type(r) AS connectionType
RETURN person.name, connectionType, otherPerson.name
ORDER BY id(person) ASC, id(otherPerson) ASC
$$) AS (start_node agtype, connection agtype, end_node agtype);

SELECT * FROM cypher('cypher_with', $$
Expand All @@ -75,20 +78,23 @@ MATCH (george {name: 'George'})<-[]-(otherPerson)
WITH otherPerson, toUpper(otherPerson.name) AS upperCaseName
WHERE upperCaseName STARTS WITH 'C'
RETURN otherPerson.name
ORDER BY id(otherPerson) ASC
$$) as (name agtype);

SELECT * FROM cypher('cypher_with', $$
MATCH (david {name: 'David'})-[]-(otherPerson)-[]->()
WITH otherPerson, count(*) AS foaf
WHERE foaf > 1
RETURN otherPerson.name
ORDER BY id(otherPerson) ASC
$$) as (name agtype);

SELECT * FROM cypher('cypher_with', $$
MATCH p = (m)-[*1..2]->(b)
WITH p, length(p) AS path_length
WHERE path_length > 1
RETURN p
ORDER BY p ASC
$$) AS (pattern agtype);

-- MATCH/WHERE with WITH/WHERE
Expand All @@ -99,6 +105,7 @@ SELECT * FROM cypher('cypher_with', $$
WITH *
WHERE m.name = 'Andres'
RETURN m.name,label(e),b.name
ORDER BY id(m) ASC, id(e) ASC, id(b) ASC
$$) AS (N1 agtype, edge agtype, N2 agtype);

-- WITH/ORDER BY
Expand Down Expand Up @@ -133,9 +140,10 @@ SELECT * FROM cypher('cypher_with', $$
MATCH (n)-[e]->(m)
WITH n, e, m
WHERE label(e) = 'KNOWS'
WITH n.name as n1, label(e) as edge, m.name as n2
WITH id(e) AS eid, n.name as n1, label(e) as edge, m.name as n2
WHERE n1 = 'Andres'
RETURN n1,edge,n2
ORDER BY eid ASC
$$) AS (N1 agtype, edge agtype, N2 agtype);

SELECT * FROM cypher('cypher_with', $$
Expand All @@ -145,6 +153,7 @@ SELECT * FROM cypher('cypher_with', $$
WITH x
LIMIT 5
RETURN x
ORDER BY x ASC
$$) as (name agtype);

SELECT * FROM cypher('cypher_with', $$
Expand All @@ -154,6 +163,7 @@ SELECT * FROM cypher('cypher_with', $$
WITH m as start_node, b as end_node
WHERE end_node.name = 'George'
RETURN id(start_node),start_node.name,id(end_node),end_node.name
ORDER BY id(start_node) ASC, id(end_node) ASC
$$) AS (id1 agtype, name1 agtype, id2 agtype, name2 agtype);

-- Expression item must be aliased.
Expand Down Expand Up @@ -284,6 +294,7 @@ SELECT * FROM cypher('with_accessor_opt', $$
MATCH (n:Person)
WITH n as m
RETURN m
ORDER BY id(m) ASC
$$) AS (n vertex);

SELECT * FROM cypher('with_accessor_opt', $$
Expand Down
Loading