mssql 12.5.3 → 12.5.4

package/lib/base/transaction.js

@@ -152,6 +152,7 @@ class Transaction extends EventEmitter {
     }
 
     this._aborted = false
+    this._abortReason = null
     this._rollbackRequested = false
     if (isolationLevel) {
       if (Object.keys(ISOLATION_LEVEL).some(key => {
@@ -199,6 +200,22 @@ class Transaction extends EventEmitter {
     })
   }
 
+  /**
+   * Creates a TransactionError for an aborted transaction, preserving the
+   * original abort reason (if any) as `originalError`.
+   *
+   * @private
+   * @return {TransactionError}
+   */
+
+  _createAbortError () {
+    const err = new TransactionError('Transaction has been aborted.', 'EABORT')
+    if (this._abortReason) {
+      Object.defineProperty(err, 'originalError', { enumerable: true, value: this._abortReason })
+    }
+    return err
+  }
+
   /**
    * @private
    * @param {basicCallback} [callback]
@@ -207,7 +224,7 @@ class Transaction extends EventEmitter {
 
   _commit (callback) {
     if (this._aborted) {
-      return setImmediate(callback, new TransactionError('Transaction has been aborted.', 'EABORT'))
+      return setImmediate(callback, this._createAbortError())
     }
 
     if (!this._acquiredConnection) {
@@ -279,7 +296,7 @@ class Transaction extends EventEmitter {
 
   _rollback (callback) {
     if (this._aborted) {
-      return setImmediate(callback, new TransactionError('Transaction has been aborted.', 'EABORT'))
+      return setImmediate(callback, this._createAbortError())
     }
 
     if (!this._acquiredConnection) {

package/lib/tedious/request.js

@@ -300,6 +300,10 @@ class Request extends BaseRequest {
           } catch (e) {
             // noop
           }
+          if (this.parent._aborted) {
+            const reason = err || errors[errors.length - 1]
+            if (reason) this.parent._abortReason = reason
+          }
           callback(err, ...args)
         }
         if (err) return callbackWithRelease(err)
@@ -501,6 +505,10 @@ class Request extends BaseRequest {
             }
 
             this.parent.release(connection)
+            if (this.parent._aborted) {
+              const reason = error || errors[errors.length - 1]
+              if (reason) this.parent._abortReason = reason
+            }
             hasReturned = true
 
             if (error) {
@@ -865,6 +873,10 @@ class Request extends BaseRequest {
             }
 
             this.parent.release(connection)
+            if (this.parent._aborted) {
+              const reason = error || errors[errors.length - 1]
+              if (reason) this.parent._abortReason = reason
+            }
             hasReturned = true
 
             if (error) {

package/lib/tedious/transaction.js

@@ -23,6 +23,7 @@ class Transaction extends BaseTransaction {
         this._acquiredConnection = null
         this._acquiredConfig = null
         this._aborted = true
+        this._abortReason = this._abortReason || new Error('Transaction was rolled back by the server')
 
         publish(CHANNELS.TRANSACTION_ROLLBACK, () => ({
           transactionId: IDS.get(this),

package/package.json

@@ -21,7 +21,7 @@
     "azure",
     "node-mssql"
   ],
-  "version": "12.5.3",
+  "version": "12.5.4",
   "main": "index.js",
   "type": "commonjs",
   "repository": {