ensure the correct db is targeted by subsequent sessions

Author: MaxAake

packages/core/src/driver.ts

@@ -880,7 +880,10 @@ class Driver {
       database: database ?? '',
       connectionProvider,
       bookmarks,
-      config: this._config,
+      config: {
+        ...this._config,
+        homeDatabase
+      },
       reactive,
       impersonatedUser,
       fetchSize,

packages/core/src/internal/connection-holder.ts

@@ -161,9 +161,9 @@ class ConnectionHolder implements ConnectionHolderInterface {
     return this._referenceCount
   }
 
-  initializeConnection (): boolean {
+  initializeConnection (homeDatabase?: string): boolean {
     if (this._referenceCount === 0 && (this._connectionProvider != null)) {
-      this._connectionPromise = this._createConnectionPromise(this._connectionProvider)
+      this._connectionPromise = this._createConnectionPromise(this._connectionProvider, homeDatabase)
     } else {
       this._referenceCount++
       return false
@@ -172,10 +172,10 @@ class ConnectionHolder implements ConnectionHolderInterface {
     return true
   }
 
-  private async _createConnectionPromise (connectionProvider: ConnectionProvider): Promise<Connection & Releasable | null> {
+  private async _createConnectionPromise (connectionProvider: ConnectionProvider, homeDatabase?: string): Promise<Connection & Releasable | null> {
     return await connectionProvider.acquireConnection({
       accessMode: this._mode,
-      database: this._database,
+      database: (this._database === '' && homeDatabase !== undefined) ? homeDatabase : this._database,
       bookmarks: await this._getBookmarks(),
       impersonatedUser: this._impersonatedUser,
       onDatabaseNameResolved: this._onDatabaseNameResolved,

packages/core/src/session.ts

@@ -76,6 +76,7 @@ class Session {
   private readonly _log: Logger
   private readonly _homeDatabaseCallback: Function | undefined
   private readonly _auth: AuthToken | undefined
+  private readonly _homeDatabaseBestGuess
   /**
    * @constructor
    * @protected
@@ -126,6 +127,7 @@ class Session {
     this._fetchSize = fetchSize
     this._onDatabaseNameResolved = this._onDatabaseNameResolved.bind(this)
     this._homeDatabaseCallback = homeDatabaseCallback
+    this._homeDatabaseBestGuess = config?.homeDatabase
     this._auth = auth
     this._getConnectionAcquistionBookmarks = this._getConnectionAcquistionBookmarks.bind(this)
     this._readConnectionHolder = new ConnectionHolder({
@@ -260,7 +262,7 @@ class Session {
       resultPromise = Promise.reject(
         newError('Cannot run query in a closed session.')
       )
-    } else if (!this._hasTx && connectionHolder.initializeConnection()) {
+    } else if (!this._hasTx && connectionHolder.initializeConnection(this._homeDatabaseBestGuess)) {
       resultPromise = connectionHolder
         .getConnection()
         // Connection won't be null at this point since the initialize method

packages/neo4j-driver-deno/lib/core/driver.ts

@@ -880,7 +880,9 @@ class Driver {
       database: database ?? '',
       connectionProvider,
       bookmarks,
-      config: this._config,
+      config: {...this._config,
+        homeDatabase
+      },
       reactive,
       impersonatedUser,
       fetchSize,

packages/neo4j-driver-deno/lib/core/internal/connection-holder.ts

@@ -161,9 +161,9 @@ class ConnectionHolder implements ConnectionHolderInterface {
     return this._referenceCount
   }
 
-  initializeConnection (): boolean {
+  initializeConnection (homeDatabase?: string): boolean {
     if (this._referenceCount === 0 && (this._connectionProvider != null)) {
-      this._connectionPromise = this._createConnectionPromise(this._connectionProvider)
+      this._connectionPromise = this._createConnectionPromise(this._connectionProvider, homeDatabase)
     } else {
       this._referenceCount++
       return false
@@ -172,10 +172,10 @@ class ConnectionHolder implements ConnectionHolderInterface {
     return true
   }
 
-  private async _createConnectionPromise (connectionProvider: ConnectionProvider): Promise<Connection & Releasable | null> {
+  private async _createConnectionPromise (connectionProvider: ConnectionProvider, homeDatabase?: string): Promise<Connection & Releasable | null> {
     return await connectionProvider.acquireConnection({
       accessMode: this._mode,
-      database: this._database,
+      database: (this._database === "" && homeDatabase !== undefined) ? homeDatabase : this._database,
       bookmarks: await this._getBookmarks(),
       impersonatedUser: this._impersonatedUser,
       onDatabaseNameResolved: this._onDatabaseNameResolved,

packages/neo4j-driver-deno/lib/core/session.ts

@@ -76,6 +76,7 @@ class Session {
   private readonly _log: Logger
   private readonly _homeDatabaseCallback: Function | undefined
   private readonly _auth: AuthToken | undefined
+  private readonly _homeDatabaseBestGuess
   /**
    * @constructor
    * @protected
@@ -126,6 +127,7 @@ class Session {
     this._fetchSize = fetchSize
     this._onDatabaseNameResolved = this._onDatabaseNameResolved.bind(this)
     this._homeDatabaseCallback = homeDatabaseCallback
+    this._homeDatabaseBestGuess = config?.homeDatabase
     this._auth = auth
     this._getConnectionAcquistionBookmarks = this._getConnectionAcquistionBookmarks.bind(this)
     this._readConnectionHolder = new ConnectionHolder({
@@ -260,7 +262,7 @@ class Session {
       resultPromise = Promise.reject(
         newError('Cannot run query in a closed session.')
       )
-    } else if (!this._hasTx && connectionHolder.initializeConnection()) {
+    } else if (!this._hasTx && connectionHolder.initializeConnection(this._homeDatabaseBestGuess)) {
       resultPromise = connectionHolder
         .getConnection()
         // Connection won't be null at this point since the initialize method

packages/neo4j-driver/test/driver.test.js

@@ -551,6 +551,9 @@ describe('#integration driver', () => {
 
     expect(driver.homeDatabaseCache.get(sharedNeo4j.authToken.principal)).toBe('neo4j')
     expect(session1._database).toBe('neo4j')
+    const session2 = driver.session({ auth: sharedNeo4j.authToken })
+    expect(session2._homeDatabaseBestGuess).toBe('neo4j')
+    await session2.run('CREATE () RETURN 43')
   })
 
   it('should discard old connections', async () => {