Merge remote-tracking branch 'origin/1.7-dev' into 1.7

neo4j · Jan 29, 2019 · c0db4cd · c0db4cd
2 parents 67746e1 + 72f1ee3
commit c0db4cd
Show file tree

Hide file tree

Showing 96 changed files with 1,654 additions and 282 deletions.
diff --git a/neo4j/Gopkg.lock b/neo4j/Gopkg.lock
diff --git a/neo4j/Gopkg.toml b/neo4j/Gopkg.toml
@@ -48,3 +48,7 @@
 [prune]
   go-tests = true
   unused-packages = true
+
+[[constraint]]
+  name = "github.com/stretchr/testify"
+  version = "1.2.2"
diff --git a/neo4j/auth_tokens.go b/neo4j/auth_tokens.go
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2018 "Neo4j,"
+ * Copyright (c) 2002-2019 "Neo4j,"
  * Neo4j Sweden AB [http://neo4j.com]
  *
  * This file is part of Neo4j.

diff --git a/neo4j/auth_tokens_test.go b/neo4j/auth_tokens_test.go
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2018 "Neo4j,"
+ * Copyright (c) 2002-2019 "Neo4j,"
  * Neo4j Sweden AB [http://neo4j.com]
  *
  * This file is part of Neo4j.

diff --git a/neo4j/config.go b/neo4j/config.go
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2018 "Neo4j,"
+ * Copyright (c) 2002-2019 "Neo4j,"
  * Neo4j Sweden AB [http://neo4j.com]
  *
  * This file is part of Neo4j.

diff --git a/neo4j/config_resolver.go b/neo4j/config_resolver.go
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2018 "Neo4j,"
+ * Copyright (c) 2002-2019 "Neo4j,"
  * Neo4j Sweden AB [http://neo4j.com]
  *
  * This file is part of Neo4j.

diff --git a/neo4j/config_test.go b/neo4j/config_test.go
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2018 "Neo4j,"
+ * Copyright (c) 2002-2019 "Neo4j,"
  * Neo4j Sweden AB [http://neo4j.com]
  *
  * This file is part of Neo4j.

diff --git a/neo4j/config_trust.go b/neo4j/config_trust.go
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2018 "Neo4j,"
+ * Copyright (c) 2002-2019 "Neo4j,"
  * Neo4j Sweden AB [http://neo4j.com]
  *
  * This file is part of Neo4j.

diff --git a/neo4j/driver.go b/neo4j/driver.go
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2018 "Neo4j,"
+ * Copyright (c) 2002-2019 "Neo4j,"
  * Neo4j Sweden AB [http://neo4j.com]
  *
  * This file is part of Neo4j.

diff --git a/neo4j/driver_test.go b/neo4j/driver_test.go
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2018 "Neo4j,"
+ * Copyright (c) 2002-2019 "Neo4j,"
  * Neo4j Sweden AB [http://neo4j.com]
  *
  * This file is part of Neo4j.

diff --git a/neo4j/error.go b/neo4j/error.go
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2018 "Neo4j,"
+ * Copyright (c) 2002-2019 "Neo4j,"
  * Neo4j Sweden AB [http://neo4j.com]
  *
  * This file is part of Neo4j.
@@ -22,6 +22,7 @@ package neo4j
 import "C"
 import (
 	"fmt"
+
 	"github.com/neo4j-drivers/gobolt"
 )
 

diff --git a/neo4j/error_test.go b/neo4j/error_test.go
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2018 "Neo4j,"
+ * Copyright (c) 2002-2019 "Neo4j,"
  * Neo4j Sweden AB [http://neo4j.com]
  *
  * This file is part of Neo4j.

diff --git a/neo4j/ginkgo_test.go b/neo4j/ginkgo_test.go
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2018 "Neo4j,"
+ * Copyright (c) 2002-2019 "Neo4j,"
  * Neo4j Sweden AB [http://neo4j.com]
  *
  * This file is part of Neo4j.

diff --git a/neo4j/gobolt_driver.go b/neo4j/gobolt_driver.go
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2018 "Neo4j,"
+ * Copyright (c) 2002-2019 "Neo4j,"
  * Neo4j Sweden AB [http://neo4j.com]
  *
  * This file is part of Neo4j.

diff --git a/neo4j/gobolt_driver_test.go b/neo4j/gobolt_driver_test.go
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2018 "Neo4j,"
+ * Copyright (c) 2002-2019 "Neo4j,"
  * Neo4j Sweden AB [http://neo4j.com]
  *
  * This file is part of Neo4j.
@@ -20,11 +20,12 @@
 package neo4j
 
 import (
+	"net/url"
+
 	. "github.com/neo4j/neo4j-go-driver/neo4j/utils/test"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/ginkgo/extensions/table"
 	. "github.com/onsi/gomega"
-	"net/url"
 
 	"github.com/neo4j-drivers/gobolt"
 )
@@ -45,7 +46,7 @@ var _ = Describe("Driver", func() {
 				}
 
 				driver, err := newGoboltDriver(driverUrl, token, nil)
-				Expect(err).To(BeGenericError(ContainSubstring("unable to convert authentication token to connector value")))
+				Expect(err).To(BeGenericError(ContainSubstring("unable to convert authentication token:")))
 				Expect(driver).To(BeNil())
 			})
 		})

diff --git a/neo4j/logging.go b/neo4j/logging.go
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2018 "Neo4j,"
+ * Copyright (c) 2002-2019 "Neo4j,"
  * Neo4j Sweden AB [http://neo4j.com]
  *
  * This file is part of Neo4j.

diff --git a/neo4j/logging_impl.go b/neo4j/logging_impl.go
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2018 "Neo4j,"
+ * Copyright (c) 2002-2019 "Neo4j,"
  * Neo4j Sweden AB [http://neo4j.com]
  *
  * This file is part of Neo4j.

diff --git a/neo4j/logging_test.go b/neo4j/logging_test.go
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2018 "Neo4j,"
+ * Copyright (c) 2002-2019 "Neo4j,"
  * Neo4j Sweden AB [http://neo4j.com]
  *
  * This file is part of Neo4j.

diff --git a/neo4j/mock_connection_test.go b/neo4j/mock_connection_test.go
diff --git a/neo4j/mock_connector_test.go b/neo4j/mock_connector_test.go
diff --git a/neo4j/mock_factory_test.go b/neo4j/mock_factory_test.go
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2018 "Neo4j,"
+ * Copyright (c) 2002-2019 "Neo4j,"
  * Neo4j Sweden AB [http://neo4j.com]
  *
  * This file is part of Neo4j.

diff --git a/neo4j/mock_logging_test.go b/neo4j/mock_logging_test.go
diff --git a/neo4j/mock_pool_test.go b/neo4j/mock_pool_test.go
diff --git a/neo4j/mock_record_test.go b/neo4j/mock_record_test.go
diff --git a/neo4j/mock_result_test.go b/neo4j/mock_result_test.go
diff --git a/neo4j/mock_resultsummary_test.go b/neo4j/mock_resultsummary_test.go
diff --git a/neo4j/record.go b/neo4j/record.go
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2018 "Neo4j,"
+ * Copyright (c) 2002-2019 "Neo4j,"
  * Neo4j Sweden AB [http://neo4j.com]
  *
  * This file is part of Neo4j.

diff --git a/neo4j/record_impl.go b/neo4j/record_impl.go
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2018 "Neo4j,"
+ * Copyright (c) 2002-2019 "Neo4j,"
  * Neo4j Sweden AB [http://neo4j.com]
  *
  * This file is part of Neo4j.

diff --git a/neo4j/result.go b/neo4j/result.go
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2018 "Neo4j,"
+ * Copyright (c) 2002-2019 "Neo4j,"
  * Neo4j Sweden AB [http://neo4j.com]
  *
  * This file is part of Neo4j.

diff --git a/neo4j/result_helpers.go b/neo4j/result_helpers.go
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2018 "Neo4j,"
+ * Copyright (c) 2002-2019 "Neo4j,"
  * Neo4j Sweden AB [http://neo4j.com]
  *
  * This file is part of Neo4j.

diff --git a/neo4j/result_helpers_test.go b/neo4j/result_helpers_test.go
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2018 "Neo4j,"
+ * Copyright (c) 2002-2019 "Neo4j,"
  * Neo4j Sweden AB [http://neo4j.com]
  *
  * This file is part of Neo4j.