Merge pull request #412 from lutovich/1.7-tx-rollback-after-failure

Allow rollback transaction after failure

Author: ali-ince

src/v1/internal/stream-observer.js

@@ -113,6 +113,14 @@ class StreamObserver {
     this._fieldKeys = [];
   }
 
+  /**
+   * Mark this observer as if it has completed with no metadata.
+   */
+  markCompleted() {
+    this._fieldKeys = [];
+    this._tail = {};
+  }
+
   /**
    * Will be called on errors.
    * If user-provided observer is present, pass the error

src/v1/transaction.js

@@ -177,9 +177,7 @@ let _states = {
       return {result: _newDummyResult(observer, "COMMIT", {}), state: _states.FAILED};
     },
     rollback: (connectionHolder, observer) => {
-      observer.onError({error:
-      "Cannot rollback transaction, because previous statements in the " +
-      "transaction has failed and the transaction has already been rolled back."});
+      observer.markCompleted();
       return {result: _newDummyResult(observer, "ROLLBACK", {}), state: _states.FAILED};
     },
     run: (connectionHolder, observer, statement, parameters) => {

test/internal/stream-observer.test.js

@@ -172,6 +172,18 @@ describe('StreamObserver', () => {
     streamObserver.onCompleted({key: 42});
   });
 
+  it('should mark as completed', done => {
+    const streamObserver = new StreamObserver();
+    streamObserver.markCompleted();
+
+    streamObserver.subscribe({
+      onCompleted: metadata => {
+        expect(metadata).toEqual({});
+        done();
+      }
+    });
+  });
+
 });
 
 function newStreamObserver() {

test/v1/session.test.js

@@ -114,7 +114,7 @@ describe('session', () => {
     const session = driver.session();
     const tx = session.beginTransaction();
     tx.run('INVALID QUERY').catch(() => {
-      tx.rollback().catch(() => {
+      tx.rollback().then(() => {
         session.close(() => {
           driver.close();
           done();

test/v1/transaction.test.js

@@ -527,6 +527,19 @@ describe('transaction', () => {
     tx.rollback().then(() => done());
   });
 
+  it('should allow rollback after failure', done => {
+    const tx = session.beginTransaction();
+    tx.run('WRONG QUERY')
+      .then(() => done.fail('Expected to fail'))
+      .catch(error => {
+        expectSyntaxError(error);
+
+        tx.rollback()
+          .catch(error => done.fail(error))
+          .then(() => done());
+      });
+  });
+
   function expectSyntaxError(error) {
     expect(error.code).toBe('Neo.ClientError.Statement.SyntaxError');
   }