Update SQL and Cypher queries per new versions

Author: prrao87

cypher/q1.cypher

@@ -0,0 +1,4 @@
+// Return the name of the person who has the email "[email protected]"
+MATCH (p:Person)
+WHERE p.email = "[email protected]"
+RETURN p.name AS name;

cypher/q1a.cypher

@@ -0,0 +1,4 @@
+// Return all the accounts owned by George
+MATCH (p:Person)-[o:Owns]->(a:Account)
+WHERE p.name = "George"
+RETURN p.name, a.account_id, a.balance;

cypher/q1b.cypher

@@ -0,0 +1,4 @@
+// Return the names of all persons who made a direct transfer to George
+MATCH (p1:Person)-[o1:Owns]->(a1:Account)<-[t:Transfer]-(a2:Account)-[o2:Owns]-(p2:Person)
+WHERE p1.name = "George"
+RETURN p2.name AS persons;

cypher/q1c.cypher

@@ -1,4 +1,5 @@
-MATCH (p1:Person)-[o1:Owns]->(a1:Account)-[t:Transfer*..5]-(a2:Account)<-[o2:Owns]-(p2:Person)
-WHERE p1.email = "[email protected]" AND p2.email = "[email protected]"
+// Find all possible direct or indirect transfer path from George's account to Edward's account.
+MATCH (p1:Person)-[o1:Owns]->(a1:Account)-[t:Transfer* 1..5]->(a2:Account)<-[o2:Owns]-(p2:Person)
+WHERE p1.name = "George" AND p2.name = "Edward"
 RETURN *, size(rels(t)) AS depth
 ORDER BY depth;

cypher/q2.cypher

@@ -0,0 +1,4 @@
+// Find a shortest transfer path from George's account to Edward's account.
+MATCH (p1:Person)-[o1:Owns]->(a1:Account)-[t:Transfer* SHORTEST]->(a2:Account)<-[o2:Owns]-(p2:Person)
+WHERE p1.name = "George" AND p2.name = "Edward"
+RETURN *;

cypher/q3.cypher

@@ -0,0 +1,4 @@
+// Find all shortest Transfer paths from George's account to Edward's account.
+MATCH (p1:Person)-[o1:Owns]->(a1:Account)-[t:Transfer* ALL SHORTEST]->(a2:Account)<-[o2:Owns]-(p2:Person)
+WHERE p1.name = "George" AND p2.name = "Edward"
+RETURN *;

cypher/q3a.cypher

@@ -1,4 +1,5 @@
-MATCH (p1:Person)-[r* ALL SHORTEST]-(p2:Person) 
-WHERE p1.email = "[email protected]" AND p2.email = "[email protected]" 
-RETURN *, size(rels(r)) AS depth
-ORDER BY depth;
+// Find all indirect connections of any type between the Person nodes representing George and
+// Edward up to a specified path length
+MATCH (p1:Person)-[r* 1..5]-(p2:Person) 
+WHERE p1.name = "George" and p2.name = "Edward"
+RETURN *;

cypher/q3b.cypher

@@ -1,6 +1,6 @@
 MATCH (a0:Account)-[t:Transfer]->(a:Account)
-WITH a, COUNT(t) AS in_degree
-ORDER BY in_degree DESC
+WITH a, COUNT(t.amount) AS total_amount
+ORDER BY total_amount DESC
 LIMIT 3
 MATCH (a)<-[o:Owns]-(p:Person)
-RETURN p.name AS person, a.account_id AS accountID, p.email AS email, in_degree;
+RETURN p.name AS person, a.account_id AS accountID, p.email AS email, total_amount;

cypher/q4.cypher

@@ -0,0 +1,3 @@
+SELECT name
+FROM Person
+WHERE email = '[email protected]';

cypher/q5.cypher

@@ -0,0 +1,4 @@
+SELECT p.name, a.account_id, a.balance
+FROM Person p
+JOIN Account a ON p.id = a.id
+WHERE p.name = 'George';

cypher/q6a.cypher renamed to cypher/q5a.cypher

@@ -0,0 +1,7 @@
+SELECT DISTINCT p2.name AS persons
+FROM Person p1
+JOIN Account a1 ON p1.id = a1.owner
+JOIN Transfer t ON a1.owner = t.target
+JOIN Account a2 ON t.source = a2.owner
+JOIN Person p2 ON a2.owner = p2.id
+WHERE p1.name = 'George';

cypher/q6b.cypher renamed to cypher/q5b.cypher

@@ -1,27 +1,26 @@
 WITH RECURSIVE TransferPaths AS (
-    -- Base case: Start with the person with one of the emails as the source
+    -- Base case: Start with transfers FROM George
     SELECT p1.id AS start_id, p2.id AS end_id, [(a1.owner, a2.owner, t.amount)] AS path, 
             1 AS depth
     FROM Person p1
     JOIN Account a1 ON p1.id = a1.owner
-    JOIN Transfer t ON a1.owner = t.source OR a1.owner = t.target
-    JOIN Account a2 ON (t.source = a2.owner OR t.target = a2.owner) AND a2.owner != a1.owner
+    JOIN Transfer t ON a1.owner = t.source  -- Only FROM source
+    JOIN Account a2 ON t.target = a2.owner  -- Only TO target
     JOIN Person p2 ON a2.owner = p2.id
-    WHERE p1.email = '[email protected]'
+    WHERE p1.name = 'George'
 
     UNION ALL
 
-    -- Recursive case: Traverse up to N relationships deep
+    -- Recursive case: Follow only outgoing transfers
     SELECT tp.start_id, p2.id AS end_id, list_append(tp.path, (a1.owner, a2.owner, t.amount)), tp.depth + 1 AS depth
     FROM TransferPaths tp
     JOIN Account a1 ON tp.end_id = a1.owner
-    JOIN Transfer t ON a1.owner = t.source OR a1.owner = t.target
-    JOIN Account a2 ON (t.source = a2.owner OR t.target = a2.owner) AND a2.owner != a1.owner
+    JOIN Transfer t ON a1.owner = t.source  -- Only FROM source
+    JOIN Account a2 ON t.target = a2.owner  -- Only TO target
     JOIN Person p2 ON a2.owner = p2.id
     WHERE tp.depth < 5
 )
--- Select the paths where the end person has the target email
 SELECT start_id, end_id, path, depth
 FROM TransferPaths, Person p
-WHERE end_id = p.id and p.email = '[email protected]'
+WHERE end_id = p.id AND p.name = 'Edward'
 ORDER BY depth;

sql/q1.sql

@@ -1,28 +1,27 @@
 WITH RECURSIVE TransferPaths AS (
-    -- Base case: Start with the person with one of the emails as the source
+    -- Base case: Start with transfers FROM George
     SELECT p1.id AS start_id, p2.id AS end_id, [(a1.owner, a2.owner, t.amount)] AS path, 
             1 AS depth
     FROM Person p1
     JOIN Account a1 ON p1.id = a1.owner
-    JOIN Transfer t ON a1.owner = t.source OR a1.owner = t.target
-    JOIN Account a2 ON (t.source = a2.owner OR t.target = a2.owner) AND a2.owner != a1.owner
+    JOIN Transfer t ON a1.owner = t.source  -- Only FROM source
+    JOIN Account a2 ON t.target = a2.owner  -- Only TO target
     JOIN Person p2 ON a2.owner = p2.id
-    WHERE p1.email = '[email protected]'
+    WHERE p1.name = 'George'
 
     UNION ALL
 
-    -- Recursive case: Traverse up to N relationships deep
+    -- Recursive case: Follow only outgoing transfers
     SELECT tp.start_id, p2.id AS end_id, list_append(tp.path, (a1.owner, a2.owner, t.amount)), tp.depth + 1 AS depth
     FROM TransferPaths tp
     JOIN Account a1 ON tp.end_id = a1.owner
-    JOIN Transfer t ON a1.owner = t.source OR a1.owner = t.target
-    JOIN Account a2 ON (t.source = a2.owner OR t.target = a2.owner) AND a2.owner != a1.owner
+    JOIN Transfer t ON a1.owner = t.source  -- Only FROM source
+    JOIN Account a2 ON t.target = a2.owner  -- Only TO target
     JOIN Person p2 ON a2.owner = p2.id
     WHERE tp.depth < 5
 )
--- Select the paths where the end person has the target email
 SELECT start_id, end_id, path, depth
 FROM TransferPaths, Person p
-WHERE end_id = p.id and p.email = '[email protected]'
+WHERE end_id = p.id AND p.name = 'Edward'
 ORDER BY depth
 LIMIT 1;