Conditional execution procedures (#203)

antepusic · web-flow · commit 6c52aca7c739 · 2023-04-05T10:21:23.000+02:00
diff --git a/e2e/do_test/complex_condition_group/test_do_case_complex_condition/input.cyp b/e2e/do_test/complex_condition_group/test_do_case_complex_condition/input.cyp
@@ -0,0 +1,8 @@
+MATCH (n) DETACH DELETE n;
+MERGE (a: Node {id: 0}) MERGE (b: Node {id: 1}) CREATE (a)-[:RELATION]->(b);
+MERGE (a: Node {id: 0}) MERGE (b: Node {id: 2}) CREATE (a)-[:RELATION]->(b);
+MERGE (a: Node {id: 1}) MERGE (b: Node {id: 2}) CREATE (a)-[:RELATION]->(b);
+MERGE (a: Node {id: 2}) MERGE (b: Node {id: 3}) CREATE (a)-[:RELATION]->(b);
+MERGE (a: Node {id: 3}) MERGE (b: Node {id: 4}) CREATE (a)-[:RELATION]->(b);
+MERGE (a: Node {id: 3}) MERGE (b: Node {id: 5}) CREATE (a)-[:RELATION]->(b);
+MERGE (a: Node {id: 4}) MERGE (b: Node {id: 5}) CREATE (a)-[:RELATION]->(b);
diff --git a/e2e/do_test/complex_condition_group/test_do_case_complex_condition/test.yml b/e2e/do_test/complex_condition_group/test_do_case_complex_condition/test.yml
@@ -0,0 +1,10 @@
+query: >
+    MATCH (n:Node)
+    WITH size(collect(n)) as n_nodes
+    CALL do.case([n_nodes = 0, "RETURN 'empty' AS graph_status;",
+                  n_nodes > 0, "RETURN 'not empty' as graph_status;"],
+                  "RETURN 'unexpected' as graph_status")
+    YIELD value
+    RETURN value.graph_status AS graph_status;
+output:
+    - graph_status: "not empty"
diff --git a/e2e/do_test/complex_condition_group/test_do_when_complex_condition/input.cyp b/e2e/do_test/complex_condition_group/test_do_when_complex_condition/input.cyp
@@ -0,0 +1,8 @@
+MATCH (n) DETACH DELETE n;
+MERGE (a: Node {id: 0}) MERGE (b: Node {id: 1}) CREATE (a)-[:RELATION]->(b);
+MERGE (a: Node {id: 0}) MERGE (b: Node {id: 2}) CREATE (a)-[:RELATION]->(b);
+MERGE (a: Node {id: 1}) MERGE (b: Node {id: 2}) CREATE (a)-[:RELATION]->(b);
+MERGE (a: Node {id: 2}) MERGE (b: Node {id: 3}) CREATE (a)-[:RELATION]->(b);
+MERGE (a: Node {id: 3}) MERGE (b: Node {id: 4}) CREATE (a)-[:RELATION]->(b);
+MERGE (a: Node {id: 3}) MERGE (b: Node {id: 5}) CREATE (a)-[:RELATION]->(b);
+MERGE (a: Node {id: 4}) MERGE (b: Node {id: 5}) CREATE (a)-[:RELATION]->(b);
diff --git a/e2e/do_test/complex_condition_group/test_do_when_complex_condition/test.yml b/e2e/do_test/complex_condition_group/test_do_when_complex_condition/test.yml
@@ -0,0 +1,10 @@
+query: >
+    MATCH (n:Node)
+    WITH size(collect(n)) as n_nodes
+    CALL do.when(n_nodes = 0,
+                "RETURN 'empty' AS graph_status;",
+                "RETURN 'not empty' as graph_status;")
+    YIELD value
+    RETURN value.graph_status AS graph_status;
+output:
+    - graph_status: "not empty"
diff --git a/e2e/do_test/disallowed_query_group/test_do_case/input.cyp b/e2e/do_test/disallowed_query_group/test_do_case/input.cyp
diff --git a/e2e/do_test/disallowed_query_group/test_do_case/test.yml b/e2e/do_test/disallowed_query_group/test_do_case/test.yml
@@ -0,0 +1,7 @@
+query: >
+    CALL do.case([TRUE, "CREATE INDEX ON :Node(id);"],
+                "")
+    YIELD value;
+
+exception: >
+    The query "CREATE INDEX ON :Node(id);" isn’t supported by `do.case` because it would execute a global operation.
diff --git a/e2e/do_test/disallowed_query_group/test_do_when/input.cyp b/e2e/do_test/disallowed_query_group/test_do_when/input.cyp
diff --git a/e2e/do_test/disallowed_query_group/test_do_when/test.yml b/e2e/do_test/disallowed_query_group/test_do_when/test.yml
@@ -0,0 +1,8 @@
+query: >
+    CALL do.when(TRUE,
+                 "CREATE INDEX ON :Node(id);",
+                 "")
+    YIELD value;
+
+exception: >
+    The query "CREATE INDEX ON :Node(id);" isn’t supported by `do.when` because it would execute a global operation.
diff --git a/e2e/do_test/do_case_group/test_run_else_query/input.cyp b/e2e/do_test/do_case_group/test_run_else_query/input.cyp
@@ -0,0 +1,8 @@
+MATCH (n) DETACH DELETE n;
+MERGE (a: Node {id: 0}) MERGE (b: Node {id: 1}) CREATE (a)-[:RELATION]->(b);
+MERGE (a: Node {id: 0}) MERGE (b: Node {id: 2}) CREATE (a)-[:RELATION]->(b);
+MERGE (a: Node {id: 1}) MERGE (b: Node {id: 2}) CREATE (a)-[:RELATION]->(b);
+MERGE (a: Node {id: 2}) MERGE (b: Node {id: 3}) CREATE (a)-[:RELATION]->(b);
+MERGE (a: Node {id: 3}) MERGE (b: Node {id: 4}) CREATE (a)-[:RELATION]->(b);
+MERGE (a: Node {id: 3}) MERGE (b: Node {id: 5}) CREATE (a)-[:RELATION]->(b);
+MERGE (a: Node {id: 4}) MERGE (b: Node {id: 5}) CREATE (a)-[:RELATION]->(b);
diff --git a/e2e/do_test/do_case_group/test_run_else_query/test.yml b/e2e/do_test/do_case_group/test_run_else_query/test.yml
@@ -0,0 +1,10 @@
+query: >
+    CALL do.case([FALSE, "MATCH (n) RETURN n;",
+                  FALSE, "MATCH (n) WHERE n.id < 4 RETURN n;"],
+                         "MATCH (n) WHERE n.id < 2 RETURN n;")
+    YIELD value
+    WITH collect(value.n) as nodes 
+    RETURN SIZE(nodes) AS n_nodes;
+
+output:
+    - n_nodes: 2
diff --git a/e2e/do_test/do_case_group/test_run_first_if_query_with_true/input.cyp b/e2e/do_test/do_case_group/test_run_first_if_query_with_true/input.cyp
@@ -0,0 +1,8 @@
+MATCH (n) DETACH DELETE n;
+MERGE (a: Node {id: 0}) MERGE (b: Node {id: 1}) CREATE (a)-[:RELATION]->(b);
+MERGE (a: Node {id: 0}) MERGE (b: Node {id: 2}) CREATE (a)-[:RELATION]->(b);
+MERGE (a: Node {id: 1}) MERGE (b: Node {id: 2}) CREATE (a)-[:RELATION]->(b);
+MERGE (a: Node {id: 2}) MERGE (b: Node {id: 3}) CREATE (a)-[:RELATION]->(b);
+MERGE (a: Node {id: 3}) MERGE (b: Node {id: 4}) CREATE (a)-[:RELATION]->(b);
+MERGE (a: Node {id: 3}) MERGE (b: Node {id: 5}) CREATE (a)-[:RELATION]->(b);
+MERGE (a: Node {id: 4}) MERGE (b: Node {id: 5}) CREATE (a)-[:RELATION]->(b);
diff --git a/e2e/do_test/do_case_group/test_run_first_if_query_with_true/test.yml b/e2e/do_test/do_case_group/test_run_first_if_query_with_true/test.yml
@@ -0,0 +1,9 @@
+query: >
+    CALL do.case([FALSE, "MATCH (n) RETURN n;",
+                  TRUE, "MATCH (n) WHERE n.id < 4 RETURN n;"])
+    YIELD value
+    WITH collect(value.n) as nodes 
+    RETURN SIZE(nodes) AS n_nodes;
+
+output:
+    - n_nodes: 4
diff --git a/e2e/do_test/do_case_group/test_simple/input.cyp b/e2e/do_test/do_case_group/test_simple/input.cyp
@@ -0,0 +1,8 @@
+MATCH (n) DETACH DELETE n;
+MERGE (a: Node {id: 0}) MERGE (b: Node {id: 1}) CREATE (a)-[:RELATION]->(b);
+MERGE (a: Node {id: 0}) MERGE (b: Node {id: 2}) CREATE (a)-[:RELATION]->(b);
+MERGE (a: Node {id: 1}) MERGE (b: Node {id: 2}) CREATE (a)-[:RELATION]->(b);
+MERGE (a: Node {id: 2}) MERGE (b: Node {id: 3}) CREATE (a)-[:RELATION]->(b);
+MERGE (a: Node {id: 3}) MERGE (b: Node {id: 4}) CREATE (a)-[:RELATION]->(b);
+MERGE (a: Node {id: 3}) MERGE (b: Node {id: 5}) CREATE (a)-[:RELATION]->(b);
+MERGE (a: Node {id: 4}) MERGE (b: Node {id: 5}) CREATE (a)-[:RELATION]->(b);
diff --git a/e2e/do_test/do_case_group/test_simple/test.yml b/e2e/do_test/do_case_group/test_simple/test.yml
@@ -0,0 +1,8 @@
+query: >
+    CALL do.case([TRUE, "MATCH (n) RETURN n;"])
+    YIELD value
+    WITH collect(value.n) as nodes 
+    RETURN SIZE(nodes) AS n_nodes;
+
+output:
+    - n_nodes: 6
diff --git a/e2e/do_test/do_case_group/test_unpaired_conditionals/input.cyp b/e2e/do_test/do_case_group/test_unpaired_conditionals/input.cyp
@@ -0,0 +1 @@
+MATCH (n) DETACH DELETE n;
diff --git a/e2e/do_test/do_case_group/test_unpaired_conditionals/test.yml b/e2e/do_test/do_case_group/test_unpaired_conditionals/test.yml
@@ -0,0 +1,6 @@
+query: >
+    CALL do.case([TRUE])
+    YIELD *;
+
+exception: >
+    The `conditionals` parameter of `do.case` must be structured as follows: [BOOLEAN, STRING, BOOLEAN, STRING, …​].
diff --git a/e2e/do_test/do_case_group/test_wrong_type_conditionals/input.cyp b/e2e/do_test/do_case_group/test_wrong_type_conditionals/input.cyp
@@ -0,0 +1 @@
+MATCH (n) DETACH DELETE n;
diff --git a/e2e/do_test/do_case_group/test_wrong_type_conditionals/test.yml b/e2e/do_test/do_case_group/test_wrong_type_conditionals/test.yml
@@ -0,0 +1,6 @@
+query: >
+    CALL do.case([TRUE, 2])
+    YIELD *;
+
+exception: >
+    The `conditionals` parameter of `do.case` must must be structured as follows: [BOOLEAN, STRING, BOOLEAN, STRING, …​].
diff --git a/e2e/do_test/do_when_group/test_run_else/input.cyp b/e2e/do_test/do_when_group/test_run_else/input.cyp
@@ -0,0 +1,8 @@
+MATCH (n) DETACH DELETE n;
+MERGE (a: Node {id: 0}) MERGE (b: Node {id: 1}) CREATE (a)-[:RELATION]->(b);
+MERGE (a: Node {id: 0}) MERGE (b: Node {id: 2}) CREATE (a)-[:RELATION]->(b);
+MERGE (a: Node {id: 1}) MERGE (b: Node {id: 2}) CREATE (a)-[:RELATION]->(b);
+MERGE (a: Node {id: 2}) MERGE (b: Node {id: 3}) CREATE (a)-[:RELATION]->(b);
+MERGE (a: Node {id: 3}) MERGE (b: Node {id: 4}) CREATE (a)-[:RELATION]->(b);
+MERGE (a: Node {id: 3}) MERGE (b: Node {id: 5}) CREATE (a)-[:RELATION]->(b);
+MERGE (a: Node {id: 4}) MERGE (b: Node {id: 5}) CREATE (a)-[:RELATION]->(b);
diff --git a/e2e/do_test/do_when_group/test_run_else/test.yml b/e2e/do_test/do_when_group/test_run_else/test.yml
@@ -0,0 +1,10 @@
+query: >
+    CALL do.when(FALSE,
+                 "MATCH (n) RETURN n;",
+                 "MATCH (n) WHERE n.id < 4 RETURN n;")
+    YIELD value
+    WITH collect(value.n) as nodes 
+    RETURN SIZE(nodes) AS n_nodes;
+
+output:
+    - n_nodes: 4
diff --git a/e2e/do_test/do_when_group/test_run_if/input.cyp b/e2e/do_test/do_when_group/test_run_if/input.cyp
@@ -0,0 +1,8 @@
+MATCH (n) DETACH DELETE n;
+MERGE (a: Node {id: 0}) MERGE (b: Node {id: 1}) CREATE (a)-[:RELATION]->(b);
+MERGE (a: Node {id: 0}) MERGE (b: Node {id: 2}) CREATE (a)-[:RELATION]->(b);
+MERGE (a: Node {id: 1}) MERGE (b: Node {id: 2}) CREATE (a)-[:RELATION]->(b);
+MERGE (a: Node {id: 2}) MERGE (b: Node {id: 3}) CREATE (a)-[:RELATION]->(b);
+MERGE (a: Node {id: 3}) MERGE (b: Node {id: 4}) CREATE (a)-[:RELATION]->(b);
+MERGE (a: Node {id: 3}) MERGE (b: Node {id: 5}) CREATE (a)-[:RELATION]->(b);
+MERGE (a: Node {id: 4}) MERGE (b: Node {id: 5}) CREATE (a)-[:RELATION]->(b);
diff --git a/e2e/do_test/do_when_group/test_run_if/test.yml b/e2e/do_test/do_when_group/test_run_if/test.yml
@@ -0,0 +1,10 @@
+query: >
+    CALL do.when(TRUE,
+                 "MATCH (n) RETURN n;",
+                 "MATCH (n) WHERE n.id < 4 RETURN n;")
+    YIELD value
+    WITH collect(value.n) as nodes 
+    RETURN SIZE(nodes) AS n_nodes;
+
+output:
+    - n_nodes: 6
diff --git a/e2e/do_test/graph_types_group/test_return_node/input.cyp b/e2e/do_test/graph_types_group/test_return_node/input.cyp
@@ -0,0 +1,8 @@
+MATCH (n) DETACH DELETE n;
+MERGE (a: Node {id: 0}) MERGE (b: Node {id: 1}) CREATE (a)-[:RELATIONSHIP]->(b);
+MERGE (a: Node {id: 0}) MERGE (b: Node {id: 2}) CREATE (a)-[:RELATIONSHIP]->(b);
+MERGE (a: Node {id: 1}) MERGE (b: Node {id: 2}) CREATE (a)-[:RELATIONSHIP]->(b);
+MERGE (a: Node {id: 2}) MERGE (b: Node {id: 3}) CREATE (a)-[:RELATIONSHIP]->(b);
+MERGE (a: Node {id: 3}) MERGE (b: Node {id: 4}) CREATE (a)-[:RELATIONSHIP]->(b);
+MERGE (a: Node {id: 3}) MERGE (b: Node {id: 5}) CREATE (a)-[:RELATIONSHIP]->(b);
+MERGE (a: Node {id: 4}) MERGE (b: Node {id: 5}) CREATE (a)-[:RELATIONSHIP]->(b);
diff --git a/e2e/do_test/graph_types_group/test_return_node/test.yml b/e2e/do_test/graph_types_group/test_return_node/test.yml
@@ -0,0 +1,18 @@
+query: >
+    CALL do.case([TRUE, "MATCH (n) WHERE n.id < 2 RETURN n AS node;"],
+                 "")
+    YIELD value
+    RETURN value.node AS node
+    ORDER BY node.id ASC;
+
+output:
+    - node:
+          labels:
+              - Node
+          properties:
+              id: 0
+    - node:
+          labels:
+              - Node
+          properties:
+              id: 1
diff --git a/e2e/do_test/graph_types_group/test_return_path/input.cyp b/e2e/do_test/graph_types_group/test_return_path/input.cyp
@@ -0,0 +1,8 @@
+MATCH (n) DETACH DELETE n;
+MERGE (a: Node {id: 0}) MERGE (b: Node {id: 1}) CREATE (a)-[:RELATIONSHIP]->(b);
+MERGE (a: Node {id: 0}) MERGE (b: Node {id: 2}) CREATE (a)-[:RELATIONSHIP]->(b);
+MERGE (a: Node {id: 1}) MERGE (b: Node {id: 2}) CREATE (a)-[:RELATIONSHIP]->(b);
+MERGE (a: Node {id: 2}) MERGE (b: Node {id: 3}) CREATE (a)-[:RELATIONSHIP]->(b);
+MERGE (a: Node {id: 3}) MERGE (b: Node {id: 4}) CREATE (a)-[:RELATIONSHIP]->(b);
+MERGE (a: Node {id: 3}) MERGE (b: Node {id: 5}) CREATE (a)-[:RELATIONSHIP]->(b);
+MERGE (a: Node {id: 4}) MERGE (b: Node {id: 5}) CREATE (a)-[:RELATIONSHIP]->(b);
diff --git a/e2e/do_test/graph_types_group/test_return_path/test.yml b/e2e/do_test/graph_types_group/test_return_path/test.yml
@@ -0,0 +1,8 @@
+query: >
+    CALL do.case([TRUE, "MATCH p = (n: Node {id:0})-[*2]-() RETURN DISTINCT p AS path;"],
+                 "")
+    YIELD value
+    RETURN DISTINCT size(nodes(value.path)) as path_size;
+
+output:
+    - path_size: 3
diff --git a/e2e/do_test/graph_types_group/test_return_relationship/input.cyp b/e2e/do_test/graph_types_group/test_return_relationship/input.cyp
@@ -0,0 +1,8 @@
+MATCH (n) DETACH DELETE n;
+MERGE (a: Node {id: 0}) MERGE (b: Node {id: 1}) CREATE (a)-[:RELATIONSHIP]->(b);
+MERGE (a: Node {id: 0}) MERGE (b: Node {id: 2}) CREATE (a)-[:RELATIONSHIP]->(b);
+MERGE (a: Node {id: 1}) MERGE (b: Node {id: 2}) CREATE (a)-[:RELATIONSHIP]->(b);
+MERGE (a: Node {id: 2}) MERGE (b: Node {id: 3}) CREATE (a)-[:RELATIONSHIP]->(b);
+MERGE (a: Node {id: 3}) MERGE (b: Node {id: 4}) CREATE (a)-[:RELATIONSHIP]->(b);
+MERGE (a: Node {id: 3}) MERGE (b: Node {id: 5}) CREATE (a)-[:RELATIONSHIP]->(b);
+MERGE (a: Node {id: 4}) MERGE (b: Node {id: 5}) CREATE (a)-[:RELATIONSHIP]->(b);
diff --git a/e2e/do_test/graph_types_group/test_return_relationship/test.yml b/e2e/do_test/graph_types_group/test_return_relationship/test.yml
@@ -0,0 +1,8 @@
+query: >
+    CALL do.case([TRUE, "MATCH (m)-[e]-(n) WHERE m.id = 1 AND n.id = 2 RETURN m, e, n;"],
+                 "")
+    YIELD value
+    RETURN type(value.e) as relationship;
+
+output:
+    - relationship: "RELATIONSHIP"
diff --git a/e2e/do_test/parameterization_group/test_do_case_params/input.cyp b/e2e/do_test/parameterization_group/test_do_case_params/input.cyp
@@ -0,0 +1,2 @@
+MATCH (n) DETACH DELETE n;
+CREATE (a: Node {id: 0});
diff --git a/e2e/do_test/parameterization_group/test_do_case_params/test.yml b/e2e/do_test/parameterization_group/test_do_case_params/test.yml
@@ -0,0 +1,10 @@
+query: >
+    CALL do.case([TRUE, "MATCH (n {id: $id}) RETURN n;"],
+                        "",
+                        {id: 0})
+    YIELD value
+    WITH collect(value.n) as nodes 
+    RETURN SIZE(nodes) AS n_nodes;
+
+output:
+    - n_nodes: 1
diff --git a/e2e/do_test/parameterization_group/test_do_when_params/input.cyp b/e2e/do_test/parameterization_group/test_do_when_params/input.cyp
@@ -0,0 +1,2 @@
+MATCH (n) DETACH DELETE n;
+CREATE (a: Node {id: 0});
diff --git a/e2e/do_test/parameterization_group/test_do_when_params/test.yml b/e2e/do_test/parameterization_group/test_do_when_params/test.yml
@@ -0,0 +1,11 @@
+query: >
+    CALL do.when(TRUE,
+                 "MATCH (n {id: $id}) RETURN n;",
+                 "MATCH (n {id: 1) RETURN n;",
+                 {id: 0})
+    YIELD value
+    WITH collect(value.n) as nodes 
+    RETURN SIZE(nodes) AS n_nodes;
+
+output:
+    - n_nodes: 1
diff --git a/e2e/do_test/parameterization_group/test_params_&_strings/input.cyp b/e2e/do_test/parameterization_group/test_params_&_strings/input.cyp
@@ -0,0 +1,2 @@
+MATCH (n) DETACH DELETE n;
+CREATE (a: Node {id: 0, prop: "$id: 0"});
diff --git a/e2e/do_test/parameterization_group/test_params_&_strings/test.yml b/e2e/do_test/parameterization_group/test_params_&_strings/test.yml
@@ -0,0 +1,10 @@
+query: >
+    CALL do.case([TRUE, "MATCH (n {id: $id, prop: \"$id: 0\"}) RETURN n;"],
+                        "",
+                        {id: 0})
+    YIELD value
+    WITH collect(value.n) as nodes 
+    RETURN SIZE(nodes) AS n_nodes;
+
+output:
+    - n_nodes: 1
diff --git a/e2e/do_test/return_nothing_group/test_do_case/input.cyp b/e2e/do_test/return_nothing_group/test_do_case/input.cyp
@@ -0,0 +1 @@
+MATCH (n) DETACH DELETE n;
diff --git a/e2e/do_test/return_nothing_group/test_do_case/test.yml b/e2e/do_test/return_nothing_group/test_do_case/test.yml
@@ -0,0 +1,7 @@
+query: >
+  CALL do.case([TRUE, "MATCH (n: Node) WHERE n.id < 10 AND n.id >= 10 RETURN *;"],
+                      "",
+                      {id: 0})
+  YIELD *;
+
+output: []
diff --git a/e2e/do_test/return_nothing_group/test_do_when/input.cyp b/e2e/do_test/return_nothing_group/test_do_when/input.cyp
@@ -0,0 +1 @@
+MATCH (n) DETACH DELETE n;
diff --git a/e2e/do_test/return_nothing_group/test_do_when/test.yml b/e2e/do_test/return_nothing_group/test_do_when/test.yml
@@ -0,0 +1,7 @@
+query: >
+  CALL do.when(TRUE,
+               "MATCH (n: Node) WHERE n.id < 10 AND n.id >= 10 RETURN *;",
+               "")
+  YIELD *;
+
+output: []
diff --git a/e2e/do_test/test_strings_containing_quotes/input.cyp b/e2e/do_test/test_strings_containing_quotes/input.cyp
@@ -0,0 +1,3 @@
+MATCH (n) DETACH DELETE n;
+CREATE (a: Node {id: 0, message: "say \"something 'nice'\" here"});
+CREATE (a: Node {id: 1, message: "say \"something 'else'\" here"});
diff --git a/e2e/do_test/test_strings_containing_quotes/test.yml b/e2e/do_test/test_strings_containing_quotes/test.yml
@@ -0,0 +1,8 @@
+query: >
+    CALL do.case([TRUE, "MATCH (n {message: \"say \\\"something 'nice'\\\" here\"}) RETURN n;"],
+                "")
+    YIELD value
+    RETURN value.n.id AS nice_id;
+
+output:
+    - nice_id: 0
diff --git a/e2e/do_test/type_conversion_group/test_return_node_relationship/input.cyp b/e2e/do_test/type_conversion_group/test_return_node_relationship/input.cyp
@@ -0,0 +1,8 @@
+MATCH (n) DETACH DELETE n;
+MERGE (a: Node {id: 0}) MERGE (b: Node {id: 1}) CREATE (a)-[:RELATION]->(b);
+MERGE (a: Node {id: 0}) MERGE (b: Node {id: 2}) CREATE (a)-[:RELATION]->(b);
+MERGE (a: Node {id: 1}) MERGE (b: Node {id: 2}) CREATE (a)-[:RELATION]->(b);
+MERGE (a: Node {id: 2}) MERGE (b: Node {id: 3}) CREATE (a)-[:RELATION]->(b);
+MERGE (a: Node {id: 3}) MERGE (b: Node {id: 4}) CREATE (a)-[:RELATION]->(b);
+MERGE (a: Node {id: 3}) MERGE (b: Node {id: 5}) CREATE (a)-[:RELATION]->(b);
+MERGE (a: Node {id: 4}) MERGE (b: Node {id: 5}) CREATE (a)-[:RELATION]->(b);
diff --git a/e2e/do_test/type_conversion_group/test_return_node_relationship/test.yml b/e2e/do_test/type_conversion_group/test_return_node_relationship/test.yml
@@ -0,0 +1,13 @@
+query: >
+    CALL do.case([TRUE, "MATCH (m)-[r]-(n) WHERE n.id = 0 AND m.id <= 2 RETURN m, r;"])
+    YIELD value
+    WITH
+        collect(value.m) AS nodes,
+        collect(value.r) AS relationships
+    RETURN
+        size(nodes) AS n_nodes,
+        size(relationships) AS n_relationships;
+
+output:
+    - n_nodes: 2
+      n_relationships: 2
diff --git a/e2e/do_test/type_conversion_group/test_return_path/input.cyp b/e2e/do_test/type_conversion_group/test_return_path/input.cyp
@@ -0,0 +1,8 @@
+MATCH (n) DETACH DELETE n;
+MERGE (a: Node {id: 0}) MERGE (b: Node {id: 1}) CREATE (a)-[:RELATION]->(b);
+MERGE (a: Node {id: 0}) MERGE (b: Node {id: 2}) CREATE (a)-[:RELATION]->(b);
+MERGE (a: Node {id: 1}) MERGE (b: Node {id: 2}) CREATE (a)-[:RELATION]->(b);
+MERGE (a: Node {id: 2}) MERGE (b: Node {id: 3}) CREATE (a)-[:RELATION]->(b);
+MERGE (a: Node {id: 3}) MERGE (b: Node {id: 4}) CREATE (a)-[:RELATION]->(b);
+MERGE (a: Node {id: 3}) MERGE (b: Node {id: 5}) CREATE (a)-[:RELATION]->(b);
+MERGE (a: Node {id: 4}) MERGE (b: Node {id: 5}) CREATE (a)-[:RELATION]->(b);
diff --git a/e2e/do_test/type_conversion_group/test_return_path/test.yml b/e2e/do_test/type_conversion_group/test_return_path/test.yml
@@ -0,0 +1,7 @@
+query: >
+    CALL do.case([TRUE, "MATCH p = ()-[*2]-() RETURN p LIMIT 1;"])
+    YIELD value
+    RETURN size(value.p) AS path_size;
+
+output:
+    - path_size: 2
diff --git a/e2e/igraphalg_test/test_leiden_node_weights/test.yml b/e2e/igraphalg_test/test_leiden_node_weights/test.yml
@@ -1,19 +1,7 @@
 query: >
     CALL igraphalg.community_leiden("CPM",NULL,1.0,0.1,NULL,2,[0.1,0.1,1.0,1.0]) 
     YIELD node, community_id
-    RETURN node.id as node_id, community_id
-    ORDER BY community_id ASC
+    RETURN COUNT(node) AS count;
 
 output:
-    - community_id: 0
-      node_id: 0
-    - community_id: 0
-      node_id: 1
-    - community_id: 0
-      node_id: 2
-    - community_id: 0
-      node_id: 3
-    - community_id: 0
-      node_id: 4
-    - community_id: 0
-      node_id: 5
+    - count: 6
diff --git a/python/do.py b/python/do.py
diff --git a/python/utils/subquery.py b/python/utils/subquery.py
