mssql-cr-layer 3.0.13 → 3.0.15

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mssql-cr-layer",
-  "version": "3.0.13",
+  "version": "3.0.15",
   "description": "A MS SQL Server interface layer for common requests",
   "repository": "andrglo/mssql-cr-layer",
   "author": {

package/src/index.js

@@ -5,6 +5,7 @@ const debug = require('debug')('layer:mssql')
 const scanMarkers = require('./scan-markers')
 
 const connectionParams = new WeakMap() // Hidden connection parameters
+const rolledBack = new WeakMap() // transaction -> rolled back (by us or by the server)
 
 // Tag a DB error with the SQL + params that produced it, so error-alert
 // consumers can show what actually failed (drivers report code/number/state but
@@ -95,16 +96,8 @@ MssqlCrLayer.prototype.connect = function() {
  * @returns {Promise} With the return of the last promise executed
  */
 MssqlCrLayer.prototype.transaction = function(fn, options) {
-  options = options || {}
-  const isolationLevel = options.ISOLATION_LEVEL || this.ISOLATION_LEVEL
-  return this.connect().then(function(connection) {
-    const transaction = new mssql.Transaction(connection)
-    let rolledBack = false
-    transaction.on('rollback', function() {
-      rolledBack = true
-    })
-    return transaction
-        .begin(mssql.ISOLATION_LEVEL[isolationLevel])
+  return this.beginTransaction(options).then(function(transaction) {
+    return Promise.resolve()
         .then(function() {
           return fn(transaction)
         })
@@ -114,7 +107,7 @@ MssqlCrLayer.prototype.transaction = function(fn, options) {
           })
         })
         .catch(function(err) {
-          if (!rolledBack) {
+          if (!rolledBack.get(transaction)) {
             return transaction.rollback().then(function() {
               throw err
             })
@@ -124,8 +117,6 @@ MssqlCrLayer.prototype.transaction = function(fn, options) {
   })
 }
 
-const rolledBack = new WeakMap()
-
 MssqlCrLayer.prototype.beginTransaction = function(options) {
   options = options || {}
   const isolationLevel = options.ISOLATION_LEVEL || this.ISOLATION_LEVEL
@@ -288,9 +279,29 @@ MssqlCrLayer.prototype.query = function(statement, params, options) {
               })
             })
             .catch(function(error) {
-              return ps.unprepare().then(function() {
+              // The server rolled the transaction back while this statement ran
+              // (an error inside a trigger, XACT_ABORT, a trigger ROLLBACK):
+              // node-mssql has already handed the connection back to the pool,
+              // so it is no longer this statement's to unprepare on - another
+              // request may be using it, and the sp_unprepare would collide
+              // with it ("Requests can only be made in the LoggedIn state").
+              // `_aborted` is node-mssql's own flag, for a transaction this
+              // layer did not create.
+              if (
+                transaction &&
+                (rolledBack.get(transaction) || transaction._aborted === true)
+              ) {
                 throw error
-              })
+              }
+              // Never let a failed unprepare replace the statement's own error
+              return ps
+                  .unprepare()
+                  .catch(function(unprepareError) {
+                    debug('unprepare failed %s %O', statement, unprepareError)
+                  })
+                  .then(function() {
+                    throw error
+                  })
             })
       })
       .catch(err => {