mssql-cr-layer 3.0.4 → 3.0.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mssql-cr-layer",
-  "version": "3.0.4",
+  "version": "3.0.6",
   "description": "A MS SQL Server interface layer for common requests",
   "repository": "andrglo/mssql-cr-layer",
   "author": {
@@ -34,5 +34,9 @@
     "debug": "^4.4.3",
     "lodash.every": "^4.6.0",
     "mssql": "^12.1.1"
+  },
+  "overrides": {
+    "serialize-javascript": "^7.0.5",
+    "diff": "^8.0.3"
   }
 }

package/src/index.js

@@ -5,6 +5,29 @@ const debug = require('debug')('layer:mssql')
 
 const connectionParams = new WeakMap() // Hidden connection parameters
 
+// 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
+// never the statement itself). Set-if-absent: the innermost runner wins and
+// outer wrappers never clobber a more specific capture. SQL is truncated so a
+// giant generated statement can't blow past downstream storage caps.
+const MAX_SQL_LENGTH = 4 * 1024
+
+function attachSqlToError(err, sql, params) {
+  if (!err || typeof err !== 'object') {
+    return err
+  }
+  if (err.sql == null && typeof sql === 'string') {
+    err.sql =
+      sql.length > MAX_SQL_LENGTH
+        ? sql.slice(0, MAX_SQL_LENGTH) + ' …(truncated)'
+        : sql
+  }
+  if (err.params == null && params != null) {
+    err.params = params
+  }
+  return err
+}
+
 module.exports = MssqlCrLayer
 
 /**
@@ -167,7 +190,7 @@ MssqlCrLayer.prototype.batch = function(script, options) {
             })
             .catch(err => {
               debug('%s %O', script, err)
-              throw err
+              throw attachSqlToError(err, script)
             })
       }
   )
@@ -207,7 +230,7 @@ MssqlCrLayer.prototype.query = function(statement, params, options) {
           })
           .catch(err => {
             debug('%s %O', statement, err)
-            throw err
+            throw attachSqlToError(err, statement)
           })
     })
   }
@@ -267,7 +290,7 @@ MssqlCrLayer.prototype.query = function(statement, params, options) {
       })
       .catch(err => {
         debug('%s %O', statement, err)
-        throw err
+        throw attachSqlToError(err, statement, params)
       })
 }