From 255d9b79dd27142190cc9ffbc27589ea7f04eb14 Mon Sep 17 00:00:00 2001 From: JacobLinCool Date: Sat, 4 Feb 2023 02:33:49 +0800 Subject: [PATCH 1/2] Use new merge syntax in example --- packages/neo4j-driver/examples/neo4j.html | 2 +- packages/neo4j-driver/examples/node.js | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/neo4j-driver/examples/neo4j.html b/packages/neo4j-driver/examples/neo4j.html index d03e8b8cc..cc4a756cf 100644 --- a/packages/neo4j-driver/examples/neo4j.html +++ b/packages/neo4j-driver/examples/neo4j.html @@ -265,7 +265,7 @@

if (document.location.href.indexOf('example') >= 0) { document.getElementById('statement').textContent = - 'MERGE (alice:Person {name: $name_a, age: $age_a})\nMERGE (bob:Person {name: $name_b, age: $age_b})\nCREATE UNIQUE (alice)-[alice_knows_bob:KNOWS]->(bob)\nRETURN alice, bob, alice_knows_bob' + 'MATCH (alice:Person {name: $name_a, age: $age_a})\nMATCH (bob:Person {name: $name_b, age: $age_b})\nMERGE (alice)-[alice_knows_bob:KNOWS]->(bob)\nRETURN alice, bob, alice_knows_bob' addParameter('name_a', 'Alice') addParameter('age_a', 33) diff --git a/packages/neo4j-driver/examples/node.js b/packages/neo4j-driver/examples/node.js index 4347bf8a3..1e7e1085f 100644 --- a/packages/neo4j-driver/examples/node.js +++ b/packages/neo4j-driver/examples/node.js @@ -20,9 +20,9 @@ var neo4j = require('neo4j') var query = [ - 'MERGE (alice:Person {name:{name_a},age:{age_a}})', - 'MERGE (bob:Person {name:{name_b},age:{age_b}})', - 'CREATE UNIQUE (alice)-[alice_knows_bob:KNOWS]->(bob)', + 'MATCH (alice:Person {name:{name_a},age:{age_a}})', + 'MATCH (bob:Person {name:{name_b},age:{age_b}})', + 'MERGE (alice)-[alice_knows_bob:KNOWS]->(bob)', 'RETURN alice, bob, alice_knows_bob' ] From 4cb168831dcc82f18c12cb0b22cefac53ce169c6 Mon Sep 17 00:00:00 2001 From: JacobLinCool Date: Wed, 15 Feb 2023 19:54:46 +0800 Subject: [PATCH 2/2] Apply suggestions from code review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Use `MERGE ... ON CREATE ...` Co-authored-by: Antonio Barcélos --- packages/neo4j-driver/examples/neo4j.html | 2 +- packages/neo4j-driver/examples/node.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/neo4j-driver/examples/neo4j.html b/packages/neo4j-driver/examples/neo4j.html index cc4a756cf..e3239b71b 100644 --- a/packages/neo4j-driver/examples/neo4j.html +++ b/packages/neo4j-driver/examples/neo4j.html @@ -265,7 +265,7 @@

if (document.location.href.indexOf('example') >= 0) { document.getElementById('statement').textContent = - 'MATCH (alice:Person {name: $name_a, age: $age_a})\nMATCH (bob:Person {name: $name_b, age: $age_b})\nMERGE (alice)-[alice_knows_bob:KNOWS]->(bob)\nRETURN alice, bob, alice_knows_bob' + 'MERGE (alice:Person {name: $name_a) ON CREATE SET alice.age = $age_a\nMERGE (bob:Person {name: $name_b}) ON CREATE SET bob.age = $age_b\nMERGE (alice)-[alice_knows_bob:KNOWS]->(bob)\nRETURN alice, bob, alice_knows_bob' addParameter('name_a', 'Alice') addParameter('age_a', 33) diff --git a/packages/neo4j-driver/examples/node.js b/packages/neo4j-driver/examples/node.js index 1e7e1085f..416973f5d 100644 --- a/packages/neo4j-driver/examples/node.js +++ b/packages/neo4j-driver/examples/node.js @@ -20,8 +20,8 @@ var neo4j = require('neo4j') var query = [ - 'MATCH (alice:Person {name:{name_a},age:{age_a}})', - 'MATCH (bob:Person {name:{name_b},age:{age_b}})', + 'MERGE (alice:Person {name:$name_a}) ON CREATE SET alice.age = $age_a', + 'MERGE (bob:Person {name:$name_b}) ON CREATE SET bob.age = $age_b', 'MERGE (alice)-[alice_knows_bob:KNOWS]->(bob)', 'RETURN alice, bob, alice_knows_bob' ]