Sending reset if there is a tx going on

Author: bigmontz

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

@@ -178,12 +178,16 @@ class ConnectionHolder implements ConnectionHolderInterface {
     return this._connectionPromise
   }
 
+<<<<<<< HEAD
   close (): Promise<null | Connection> {
+=======
+  close(hasTx?: boolean): Promise<void | Connection> {
+>>>>>>> Sending reset if there is a tx going on
     if (this._referenceCount === 0) {
       return this._connectionPromise
     }
     this._referenceCount = 0
-    return this._releaseConnection()
+    return this._releaseConnection(hasTx)
   }
 
   /**
@@ -197,7 +201,7 @@ class ConnectionHolder implements ConnectionHolderInterface {
     this._connectionPromise = this._connectionPromise
       .then((connection?: Connection|null) => {
         if (connection != null) {
-          if (connection.isOpen() && connection.hasOngoingObservableRequests()) {
+          if (connection.isOpen() && (connection.hasOngoingObservableRequests() || hasTx)) {
             return connection
               .resetAndFlush()
               .catch(ignoreError)

packages/core/src/session.ts

@@ -494,8 +494,8 @@ class Session {
 
       this._transactionExecutor.close()
 
-      await this._readConnectionHolder.close()
-      await this._writeConnectionHolder.close()
+      await this._readConnectionHolder.close(this._hasTx)
+      await this._writeConnectionHolder.close(this._hasTx)
     }
   }
 

packages/core/test/session.test.ts

@@ -196,17 +196,28 @@ describe('session', () => {
     expect(resetAndFlushSpy).toHaveBeenCalledTimes(1)
   }, 70000)
 
-  it('close should not reset connection if there is not an ongoing request ', async () => {
+  it('close should not reset connection if there is not an ongoing request', async () => {
     const connection = newFakeConnection()
     connection.hasOngoingObservableRequests = () => false
     const resetAndFlushSpy = jest.spyOn(connection, 'resetAndFlush')
-    const session = newSessionWithConnection(connection)
+    const session = newSessionWithConnection(connection, false)
 
     await session.close()
 
     expect(resetAndFlushSpy).not.toHaveBeenCalled()
   }, 70000)
 
+  it('close should reset connection if there is not an ongoing request but it has tx running', async () => {
+    const connection = newFakeConnection()
+    connection.hasOngoingObservableRequests = () => false
+    const resetAndFlushSpy = jest.spyOn(connection, 'resetAndFlush')
+    const session = newSessionWithConnection(connection)
+
+    await session.close()
+
+    expect(resetAndFlushSpy).toHaveBeenCalled()
+  }, 70000)
+
   it('should close transaction executor', done => {
     const session = newSessionWithConnection(newFakeConnection())