Use given database when retrieving server version at Neo4j QR init

Author: adamnsch

graphdatascience/query_runner/neo4j_query_runner.py

@@ -46,18 +46,20 @@ def create(
             driver = neo4j.GraphDatabase.driver(endpoint, auth=auth, **config)
 
             query_runner = Neo4jQueryRunner(
-                driver, auto_close=True, bookmarks=bookmarks, config=config, server_version=server_version
+                driver,
+                auto_close=True,
+                bookmarks=bookmarks,
+                config=config,
+                server_version=server_version,
+                database=database,
             )
 
         elif isinstance(endpoint, neo4j.Driver):
-            query_runner = Neo4jQueryRunner(endpoint, auto_close=False, bookmarks=bookmarks)
+            query_runner = Neo4jQueryRunner(endpoint, auto_close=False, bookmarks=bookmarks, database=database)
 
         else:
             raise ValueError(f"Invalid endpoint type: {type(endpoint)}")
 
-        if database:
-            query_runner.set_database(database)
-
         return query_runner
 
     @staticmethod
@@ -97,7 +99,7 @@ def run_cypher(
         if database is None:
             database = self._database
 
-        self._verify_connectivity()
+        self._verify_connectivity(database=database)
 
         with self._driver.session(database=database, bookmarks=self.bookmarks()) as session:
             try:
@@ -303,11 +305,14 @@ def handle_driver_exception(session: neo4j.Session, e: Exception) -> None:
 
         raise SyntaxError(generate_suggestive_error_message(requested_endpoint, all_endpoints)) from e
 
-    def _verify_connectivity(self) -> None:
+    def _verify_connectivity(self, database: Optional[str] = None) -> None:
         WAIT_TIME = 1
         MAX_RETRYS = 10 * 60
         WARN_INTERVAL = 10
 
+        if database is None:
+            database = self._database
+
         exception = None
         retrys = 0
         while retrys < MAX_RETRYS:
@@ -318,7 +323,7 @@ def _verify_connectivity(self) -> None:
                         category=neo4j.ExperimentalWarning,
                         message=r"^The configuration may change in the future.$",
                     )
-                self._driver.verify_connectivity()
+                self._driver.verify_connectivity(database=database)
                 break
             except neo4j.exceptions.DriverError as e:
                 exception = e

graphdatascience/tests/integration/test_database_ops.py

@@ -13,6 +13,22 @@
 GRAPH_NAME = "g"
 
 
+@pytest.mark.skip_on_aura
+def test_init_without_neo4j_db(runner: Neo4jQueryRunner) -> None:
+    default_database = runner.database()
+
+    MY_DB_NAME = "bananas"
+    runner.run_cypher("CREATE DATABASE $dbName WAIT", {"dbName": MY_DB_NAME})
+
+    runner.run_cypher("DROP DATABASE $dbName WAIT", {"dbName": default_database})
+
+    try:
+        _ = GraphDataScience(URI, AUTH, database=MY_DB_NAME)
+    finally:
+        runner.run_cypher("CREATE DATABASE $dbName WAIT", {"dbName": default_database}, database=MY_DB_NAME)
+        runner.run_cypher("DROP DATABASE $dbName WAIT", {"dbName": MY_DB_NAME})
+
+
 @pytest.mark.skip_on_aura
 def test_switching_db(runner: Neo4jQueryRunner) -> None:
     default_database = runner.database()

tox.ini

@@ -68,6 +68,7 @@ deps =
 	-r {toxinidir}/requirements/dev/notebook-ci.txt
 commands =
 	python ./scripts/run_notebooks.py
+
 [testenv:jupyter-notebook-session-ci]
 passenv =
 	AURA_API_CLIENT_ID