From a0f07c1652ca8436d648a686f819267c46b4680f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandbox=20=F0=9F=A4=96?= Date: Mon, 11 Dec 2023 09:18:01 +0000 Subject: [PATCH] Triggered by direct commit. Origin: https://github.com/neo4j-contrib/sandbox-code-updater/commit/9452d62941fd3de583c79d51df836ec60d1783ac --- code/go/example.go | 57 ++++++++++++++++---------------------- code/javascript/example.js | 2 +- code/python/example.py | 24 ++++++++-------- 3 files changed, 36 insertions(+), 47 deletions(-) diff --git a/code/go/example.go b/code/go/example.go index 736c705..dfd7eaf 100644 --- a/code/go/example.go +++ b/code/go/example.go @@ -3,9 +3,9 @@ package main import ( + "context" "fmt" - "github.com/neo4j/neo4j-go-driver/v4/neo4j" - "io" + "github.com/neo4j/neo4j-go-driver/v5/neo4j" "reflect" ) @@ -19,46 +19,37 @@ func main() { } } -func runQuery(uri, database, username, password string) (result []string, err error) { - driver, err := neo4j.NewDriver(uri, neo4j.BasicAuth(username, password, "")) +func runQuery(uri, database, username, password string) (_ []string, err error) { + ctx := context.Background() + driver, err := neo4j.NewDriverWithContext(uri, neo4j.BasicAuth(username, password, "")) if err != nil { return nil, err } - defer func() {err = handleClose(driver, err)}() - session := driver.NewSession(neo4j.SessionConfig{AccessMode: neo4j.AccessModeRead, DatabaseName: database}) - defer func() {err = handleClose(session, err)}() - results, err := session.ReadTransaction(func(transaction neo4j.Transaction) (interface{}, error) { - result, err := transaction.Run( - ` - MATCH (i:IP {ip:$ipAddress})-[r:FROM_IP]-(p:Purchase) - RETURN p.amount as amount - `, map[string]interface{}{ - "ipAddress": "168.166.144.243", - }) + defer func() { err = handleClose(ctx, driver, err) }() + query := " MATCH (i:IP {ip:$ipAddress})-[r:FROM_IP]-(p:Purchase) + RETURN p.amount as amount + params := map[string]any{"ipAddress": "168.166.144.243"} + result, err := neo4j.ExecuteQuery(ctx, driver, query, params, + neo4j.EagerResultTransformer, + neo4j.ExecuteQueryWithDatabase(database), + neo4j.ExecuteQueryWithReadersRouting()) + if err != nil { + return nil, err + } + amounts := make([]string, len(result.Records)) + for i, record := range result.Records { + // this assumes all actors have names, hence ignoring the 2nd returned value + name, _, err := neo4j.GetRecordValue[string](record, "amount") if err != nil { return nil, err } - var arr []string - for result.Next() { - value, found := result.Record().Get("amount") - if found { - arr = append(arr, value.(string)) - } - } - if err = result.Err(); err != nil { - return nil, err - } - return arr, nil - }) - if err != nil { - return nil, err + amounts[i] = name } - result = results.([]string) - return result, err + return amounts, nil } -func handleClose(closer io.Closer, previousError error) error { - err := closer.Close() +func handleClose(ctx context.Context, closer interface{ Close(context.Context) error }, previousError error) error { + err := closer.Close(ctx) if err == nil { return previousError } diff --git a/code/javascript/example.js b/code/javascript/example.js index a834600..717d8b9 100644 --- a/code/javascript/example.js +++ b/code/javascript/example.js @@ -3,7 +3,7 @@ const neo4j = require('neo4j-driver'); const driver = neo4j.driver('neo4j://:', neo4j.auth.basic('', ''), - {/* encrypted: 'ENCRYPTION_OFF' */}); + {}); const query = ` diff --git a/code/python/example.py b/code/python/example.py index 0e57d37..1662948 100644 --- a/code/python/example.py +++ b/code/python/example.py @@ -1,22 +1,20 @@ -# pip3 install neo4j-driver +# pip3 install neo4j # python3 example.py from neo4j import GraphDatabase, basic_auth -driver = GraphDatabase.driver( - "neo4j://:", - auth=basic_auth("", "")) - cypher_query = ''' MATCH (i:IP {ip:$ipAddress})-[r:FROM_IP]-(p:Purchase) RETURN p.amount as amount ''' -with driver.session(database="neo4j") as session: - results = session.read_transaction( - lambda tx: tx.run(cypher_query, - ipAddress="168.166.144.243").data()) - for record in results: - print(record['amount']) - -driver.close() +with GraphDatabase.driver( + "neo4j://:", + auth=("", "") +) as driver: + result = driver.execute_query( + cypher_query, + ipAddress="168.166.144.243", + database_="neo4j") + for record in result.records: + print(record['amount'])