Timeout errors shouldn't silently ignore the passed errors, but rathe…

…r reject with original error. Fixes #2582 (#2626)
knex · Jun 5, 2018 · 27250b6 · 27250b6
1 parent 1c65e69
commit 27250b6
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/transaction.js b/src/transaction.js
@@ -101,15 +101,15 @@ export default class Transaction extends EventEmitter {
     return this.query(conn, 'ROLLBACK;', 2, error)
       .timeout(5000)
       .catch(Promise.TimeoutError, () => {
-        this._resolver();
+        this._rejecter(error);
       });
   }
 
   rollbackTo(conn, error) {
     return this.query(conn, `ROLLBACK TO SAVEPOINT ${this.txid}`, 2, error)
       .timeout(5000)
       .catch(Promise.TimeoutError, () => {
-        this._resolver();
+        this._rejecter(error);
       });
   }