Skip to content

Commit 9105e4a

Browse files
Peter Wilhelmsson2hdddg
Peter Wilhelmsson
authored and
2hdddg
committed
Update examples used in documentation
1 parent 8155203 commit 9105e4a

File tree

1 file changed

+82
-84
lines changed

1 file changed

+82
-84
lines changed

‎neo4j/test-integration/examples_test.go

Lines changed: 82 additions & 84 deletions
Original file line numberDiff line numberDiff line change
@@ -284,30 +284,22 @@ var _ = Describe("Examples", func() {
284284

285285
// tag::hello-world[]
286286
func helloWorld(uri, username, password string, encrypted bool) (string, error) {
287-
var (
288-
err error
289-
driver neo4j.Driver
290-
session neo4j.Session
291-
result neo4j.Result
292-
greeting interface{}
293-
)
294-
295-
driver, err = neo4j.NewDriver(uri, neo4j.BasicAuth(username, password, ""), func(c *neo4j.Config) {
287+
driver, err := neo4j.NewDriver(uri, neo4j.BasicAuth(username, password, ""), func(c *neo4j.Config) {
296288
c.Encrypted = encrypted
297289
})
298290
if err != nil {
299291
return "", err
300292
}
301293
defer driver.Close()
302294

303-
session, err = driver.Session(neo4j.AccessModeWrite)
295+
session, err := driver.Session(neo4j.AccessModeWrite)
304296
if err != nil {
305297
return "", err
306298
}
307299
defer session.Close()
308300

309-
greeting, err = session.WriteTransaction(func(transaction neo4j.Transaction) (interface{}, error) {
310-
result, err = transaction.Run(
301+
greeting, err := session.WriteTransaction(func(transaction neo4j.Transaction) (interface{}, error) {
302+
result, err := transaction.Run(
311303
"CREATE (a:Greeting) SET a.message = $message RETURN a.message + ', from node ' + id(a)",
312304
map[string]interface{}{"message": "hello, world"})
313305
if err != nil {
@@ -391,6 +383,40 @@ func createDriverWithAddressResolver(virtualURI, username, password string, encr
391383
})
392384
}
393385

386+
func addPerson(name string) error {
387+
const (
388+
username = "neo4j"
389+
password = "some password"
390+
)
391+
392+
driver, err := createDriverWithAddressResolver("bolt+routing://x.acme.com", username, password, false,
393+
neo4j.NewServerAddress("a.acme.com", "7676"),
394+
neo4j.NewServerAddress("b.acme.com", "8787"),
395+
neo4j.NewServerAddress("c.acme.com", "9898"))
396+
if err != nil {
397+
return err
398+
}
399+
defer driver.Close()
400+
401+
session, err := driver.Session(neo4j.AccessModeWrite)
402+
if err != nil {
403+
return err
404+
}
405+
defer session.Close()
406+
407+
result, err := session.Run("CREATE (n:Person { name: $name})", map[string]interface{}{"name": name})
408+
if err != nil {
409+
return err
410+
}
411+
412+
_, err = result.Consume()
413+
if err != nil {
414+
return err
415+
}
416+
417+
return nil
418+
}
419+
394420
// end::config-custom-resolver[]
395421

396422
// tag::config-connection-pool[]
@@ -426,17 +452,15 @@ func createDriverWithMaxRetryTime(uri, username, password string, encrypted bool
426452

427453
// tag::service-unavailable[]
428454
func createItem(driver neo4j.Driver) error {
429-
var err error
430-
var session neo4j.Session
431-
var result neo4j.Result
432-
433-
if session, err = driver.Session(neo4j.AccessModeWrite); err != nil {
455+
session, err := driver.Session(neo4j.AccessModeWrite)
456+
if err != nil {
434457
return err
435458
}
436459
defer session.Close()
437460

438461
_, err = session.WriteTransaction(func(tx neo4j.Transaction) (interface{}, error) {
439-
if result, err = tx.Run("CREATE (a:Item)", nil); err != nil {
462+
result, err := tx.Run("CREATE (a:Item)", nil)
463+
if err != nil {
440464
return nil, err
441465
}
442466

@@ -461,16 +485,14 @@ func addItem(driver neo4j.Driver) bool {
461485
// end::service-unavailable[]
462486

463487
func countNodes(driver neo4j.Driver, label string, property string, value string) (int64, error) {
464-
var err error
465-
var session neo4j.Session
466-
var result neo4j.Result
467-
468-
if session, err = driver.Session(neo4j.AccessModeRead); err != nil {
488+
session, err := driver.Session(neo4j.AccessModeRead)
489+
if err != nil {
469490
return -1, err
470491
}
471492
defer session.Close()
472493

473-
if result, err = session.Run(fmt.Sprintf("MATCH (a:%s {%s: $value}) RETURN count(a)", label, property), map[string]interface{}{"value": value}); err != nil {
494+
result, err := session.Run(fmt.Sprintf("MATCH (a:%s {%s: $value}) RETURN count(a)", label, property), map[string]interface{}{"value": value})
495+
if err != nil {
474496
return -1, err
475497
}
476498

@@ -483,16 +505,14 @@ func countNodes(driver neo4j.Driver, label string, property string, value string
483505

484506
// tag::session[]
485507
func addPersonInSession(driver neo4j.Driver, name string) error {
486-
var err error
487-
var session neo4j.Session
488-
var result neo4j.Result
489-
490-
if session, err = driver.Session(neo4j.AccessModeWrite); err != nil {
508+
session, err := driver.Session(neo4j.AccessModeWrite)
509+
if err != nil {
491510
return err
492511
}
493512
defer session.Close()
494513

495-
if result, err = session.Run("CREATE (a:Person {name: $name})", map[string]interface{}{"name": name}); err != nil {
514+
result, err := session.Run("CREATE (a:Person {name: $name})", map[string]interface{}{"name": name})
515+
if err != nil {
496516
return err
497517
}
498518

@@ -507,16 +527,14 @@ func addPersonInSession(driver neo4j.Driver, name string) error {
507527

508528
// tag::autocommit-transaction[]
509529
func addPersonInAutoCommitTx(driver neo4j.Driver, name string) error {
510-
var err error
511-
var session neo4j.Session
512-
var result neo4j.Result
513-
514-
if session, err = driver.Session(neo4j.AccessModeWrite); err != nil {
530+
session, err := driver.Session(neo4j.AccessModeWrite)
531+
if err != nil {
515532
return err
516533
}
517534
defer session.Close()
518535

519-
if result, err = session.Run("CREATE (a:Person {name: $name})", map[string]interface{}{"name": name}); err != nil {
536+
result, err := session.Run("CREATE (a:Person {name: $name})", map[string]interface{}{"name": name})
537+
if err != nil {
520538
return err
521539
}
522540

@@ -531,17 +549,15 @@ func addPersonInAutoCommitTx(driver neo4j.Driver, name string) error {
531549

532550
// tag::transaction-function[]
533551
func addPersonInTxFunc(driver neo4j.Driver, name string) error {
534-
var err error
535-
var session neo4j.Session
536-
var result neo4j.Result
537-
538-
if session, err = driver.Session(neo4j.AccessModeWrite); err != nil {
552+
session, err := driver.Session(neo4j.AccessModeWrite)
553+
if err != nil {
539554
return err
540555
}
541556
defer session.Close()
542557

543558
_, err = session.WriteTransaction(func(tx neo4j.Transaction) (interface{}, error) {
544-
if result, err = tx.Run("CREATE (a:Person {name: $name})", map[string]interface{}{"name": name}); err != nil {
559+
result, err := tx.Run("CREATE (a:Person {name: $name})", map[string]interface{}{"name": name})
560+
if err != nil {
545561
return nil, err
546562
}
547563

@@ -586,10 +602,8 @@ func makeFriendTxFunc(person1 string, person2 string) neo4j.TransactionWork {
586602

587603
func printFriendsTxFunc() neo4j.TransactionWork {
588604
return func(tx neo4j.Transaction) (interface{}, error) {
589-
var err error
590-
var result neo4j.Result
591-
592-
if result, err = tx.Run("MATCH (a)-[:KNOWS]->(b) RETURN a.name, b.name", nil); err != nil {
605+
result, err := tx.Run("MATCH (a)-[:KNOWS]->(b) RETURN a.name, b.name", nil)
606+
if err != nil {
593607
return nil, err
594608
}
595609

@@ -602,10 +616,8 @@ func printFriendsTxFunc() neo4j.TransactionWork {
602616
}
603617

604618
func addAndEmploy(driver neo4j.Driver, person string, company string) (string, error) {
605-
var err error
606-
var session neo4j.Session
607-
608-
if session, err = driver.Session(neo4j.AccessModeWrite); err != nil {
619+
session, err := driver.Session(neo4j.AccessModeWrite)
620+
if err != nil {
609621
return "", err
610622
}
611623
defer session.Close()
@@ -624,10 +636,8 @@ func addAndEmploy(driver neo4j.Driver, person string, company string) (string, e
624636
}
625637

626638
func makeFriend(driver neo4j.Driver, person1 string, person2 string, bookmarks ...string) (string, error) {
627-
var err error
628-
var session neo4j.Session
629-
630-
if session, err = driver.Session(neo4j.AccessModeWrite, bookmarks...); err != nil {
639+
session, err := driver.Session(neo4j.AccessModeWrite, bookmarks...)
640+
if err != nil {
631641
return "", err
632642
}
633643
defer session.Close()
@@ -642,7 +652,6 @@ func makeFriend(driver neo4j.Driver, person1 string, person2 string, bookmarks .
642652
func addEmployAndMakeFriends(driver neo4j.Driver) error {
643653
var bookmark1, bookmark2, bookmark3 string
644654
var err error
645-
var session neo4j.Session
646655

647656
if bookmark1, err = addAndEmploy(driver, "Alice", "Wayne Enterprises"); err != nil {
648657
return err
@@ -656,7 +665,8 @@ func addEmployAndMakeFriends(driver neo4j.Driver) error {
656665
return err
657666
}
658667

659-
if session, err = driver.Session(neo4j.AccessModeRead, bookmark1, bookmark2, bookmark3); err != nil {
668+
session, err := driver.Session(neo4j.AccessModeRead, bookmark1, bookmark2, bookmark3)
669+
if err != nil {
660670
return err
661671
}
662672
defer session.Close()
@@ -673,10 +683,8 @@ func addEmployAndMakeFriends(driver neo4j.Driver) error {
673683
// tag::read-write-transaction[]
674684
func addPersonNodeTxFunc(name string) neo4j.TransactionWork {
675685
return func(tx neo4j.Transaction) (interface{}, error) {
676-
var err error
677-
var result neo4j.Result
678-
679-
if result, err = tx.Run("CREATE (a:Person {name: $name})", map[string]interface{}{"name": name}); err != nil {
686+
result, err := tx.Run("CREATE (a:Person {name: $name})", map[string]interface{}{"name": name})
687+
if err != nil {
680688
return nil, err
681689
}
682690

@@ -686,10 +694,8 @@ func addPersonNodeTxFunc(name string) neo4j.TransactionWork {
686694

687695
func matchPersonNodeTxFunc(name string) neo4j.TransactionWork {
688696
return func(tx neo4j.Transaction) (interface{}, error) {
689-
var err error
690-
var result neo4j.Result
691-
692-
if result, err = tx.Run("MATCH (a:Person {name: $name}) RETURN id(a)", map[string]interface{}{"name": name}); err != nil {
697+
result, err := tx.Run("MATCH (a:Person {name: $name}) RETURN id(a)", map[string]interface{}{"name": name})
698+
if err != nil {
693699
return nil, err
694700
}
695701

@@ -702,11 +708,8 @@ func matchPersonNodeTxFunc(name string) neo4j.TransactionWork {
702708
}
703709

704710
func addPersonNode(driver neo4j.Driver, name string) (int64, error) {
705-
var err error
706-
var id interface{}
707-
var session neo4j.Session
708-
709-
if session, err = driver.Session(neo4j.AccessModeWrite); err != nil {
711+
session, err := driver.Session(neo4j.AccessModeWrite)
712+
if err != nil {
710713
return -1, err
711714
}
712715
defer session.Close()
@@ -715,6 +718,7 @@ func addPersonNode(driver neo4j.Driver, name string) (int64, error) {
715718
return -1, err
716719
}
717720

721+
var id interface{}
718722
if id, err = session.ReadTransaction(matchPersonNodeTxFunc(name)); err != nil {
719723
return -1, err
720724
}
@@ -726,20 +730,17 @@ func addPersonNode(driver neo4j.Driver, name string) (int64, error) {
726730

727731
// tag::result-consume[]
728732
func getPeople(driver neo4j.Driver) ([]string, error) {
729-
var people interface{}
730-
var err error
731-
var session neo4j.Session
732-
733-
if session, err = driver.Session(neo4j.AccessModeRead); err != nil {
733+
session, err := driver.Session(neo4j.AccessModeRead)
734+
if err != nil {
734735
return nil, err
735736
}
736737
defer session.Close()
737738

738-
people, err = session.ReadTransaction(func(tx neo4j.Transaction) (interface{}, error) {
739+
people, err := session.ReadTransaction(func(tx neo4j.Transaction) (interface{}, error) {
739740
var list []string
740-
var result neo4j.Result
741741

742-
if result, err = tx.Run("MATCH (a:Person) RETURN a.name ORDER BY a.name", nil); err != nil {
742+
result, err := tx.Run("MATCH (a:Person) RETURN a.name ORDER BY a.name", nil)
743+
if err != nil {
743744
return nil, err
744745
}
745746

@@ -764,23 +765,20 @@ func getPeople(driver neo4j.Driver) ([]string, error) {
764765

765766
// tag::result-retain[]
766767
func addPersonsAsEmployees(driver neo4j.Driver, companyName string) (int, error) {
767-
var session neo4j.Session
768-
var err error
769-
var persons []neo4j.Record
770-
var employees int
771-
772-
if session, err = driver.Session(neo4j.AccessModeWrite); err != nil {
768+
session, err := driver.Session(neo4j.AccessModeWrite)
769+
if err != nil {
773770
return 0, err
774771
}
775772
defer session.Close()
776773

777-
persons, err = neo4j.Collect(session.ReadTransaction(func(tx neo4j.Transaction) (interface{}, error) {
774+
persons, err := neo4j.Collect(session.ReadTransaction(func(tx neo4j.Transaction) (interface{}, error) {
778775
return tx.Run("MATCH (a:Person) RETURN a.name AS name", nil)
779776
}))
780777
if err != nil {
781778
return 0, err
782779
}
783780

781+
employees := 0
784782
for _, person := range persons {
785783
_, err = session.WriteTransaction(func(tx neo4j.Transaction) (interface{}, error) {
786784
return tx.Run("MATCH (emp:Person {name: $person_name}) "+

0 commit comments

Comments
 (0)