mssql 12.3.0 → 12.4.0

package/lib/tedious/request.js

@@ -200,9 +200,13 @@ const parameterCorrection = function (value) {
     }
 
     for (const col of value.columns) {
+      const tediousType = getTediousType(col.type)
+      if (tediousType === tds.TYPES.Variant) {
+        throw new RequestError(`Column '${col.name}' in TVP '${value.schema ? value.schema + '.' : ''}${value.name}' uses sql_variant which is not supported by the tedious driver for TVP column types. Consider using a more specific data type.`, 'EARGS')
+      }
       tvp.columns.push({
         name: col.name,
-        type: getTediousType(col.type),
+        type: tediousType,
         length: col.length,
         scale: col.scale,
         precision: col.precision
@@ -664,9 +668,18 @@ class Request extends BaseRequest {
               } catch (e) {
                 e.message = `Validation failed for parameter '${name}'. ${e.message}`
                 const err = new RequestError(e, 'EPARAM')
+                delete this._cancel
+
+                if (!hasReturned) {
+                  for (const event in errorHandlers) {
+                    connection.removeListener(event, errorHandlers[event])
+                  }
 
-                this.parent.release(connection)
-                return callback(err)
+                  this.parent.release(connection)
+                  hasReturned = true
+                  return callback(err)
+                }
+                return
               }
             }
 
@@ -703,21 +716,23 @@ class Request extends BaseRequest {
 
             req.sqlTextOrProcedure = `declare ${declarations.join(', ')};select ${assigns.join(', ')};${req.sqlTextOrProcedure};${batchHasOutput ? (`select 1 as [___return___], ${selects.join(', ')}`) : ''}`
           }
-        } else {
-          for (const name in this.parameters) {
-            if (!objectHasProperty(this.parameters, name)) {
-              continue
-            }
-            const param = this.parameters[name]
-            if (param.io === 1) {
-              req.addParameter(param.name, getTediousType(param.type), parameterCorrection(param.value), { length: param.length, scale: param.scale, precision: param.precision })
-            } else {
-              req.addOutputParameter(param.name, getTediousType(param.type), parameterCorrection(param.value), { length: param.length, scale: param.scale, precision: param.precision })
-            }
-          }
         }
 
         try {
+          if (!this._isBatch) {
+            for (const name in this.parameters) {
+              if (!objectHasProperty(this.parameters, name)) {
+                continue
+              }
+              const param = this.parameters[name]
+              if (param.io === 1) {
+                req.addParameter(param.name, getTediousType(param.type), parameterCorrection(param.value), { length: param.length, scale: param.scale, precision: param.precision })
+              } else {
+                req.addOutputParameter(param.name, getTediousType(param.type), parameterCorrection(param.value), { length: param.length, scale: param.scale, precision: param.precision })
+              }
+            }
+          }
+
           connection[this._isBatch ? 'execSqlBatch' : 'execSql'](req)
         } catch (error) {
           handleError(true, connection, error)
@@ -983,19 +998,34 @@ class Request extends BaseRequest {
           output[parameterName] = value
         })
 
-        for (const name in this.parameters) {
-          if (!objectHasProperty(this.parameters, name)) {
-            continue
+        try {
+          for (const name in this.parameters) {
+            if (!objectHasProperty(this.parameters, name)) {
+              continue
+            }
+            const param = this.parameters[name]
+            if (param.io === 1) {
+              req.addParameter(param.name, getTediousType(param.type), parameterCorrection(param.value), { length: param.length, scale: param.scale, precision: param.precision })
+            } else {
+              req.addOutputParameter(param.name, getTediousType(param.type), parameterCorrection(param.value), { length: param.length, scale: param.scale, precision: param.precision })
+            }
           }
-          const param = this.parameters[name]
-          if (param.io === 1) {
-            req.addParameter(param.name, getTediousType(param.type), parameterCorrection(param.value), { length: param.length, scale: param.scale, precision: param.precision })
-          } else {
-            req.addOutputParameter(param.name, getTediousType(param.type), parameterCorrection(param.value), { length: param.length, scale: param.scale, precision: param.precision })
+
+          connection.callProcedure(req)
+        } catch (error) {
+          const err = error instanceof RequestError ? error : new RequestError(error, 'EREQUEST')
+          delete this._cancel
+
+          if (!hasReturned) {
+            for (const event in errorHandlers) {
+              connection.removeListener(event, errorHandlers[event])
+            }
+
+            this.parent.release(connection)
+            hasReturned = true
+            callback(err)
           }
         }
-
-        connection.callProcedure(req)
       })
     })
   }

package/lib/tedious/transaction.js

@@ -4,6 +4,7 @@ const debug = require('debug')('mssql:tedi')
 const BaseTransaction = require('../base/transaction')
 const { IDS } = require('../utils')
 const TransactionError = require('../error/transaction-error')
+const { CHANNELS, publish } = require('../diagnostics')
 
 class Transaction extends BaseTransaction {
   constructor (parent) {
@@ -23,6 +24,10 @@ class Transaction extends BaseTransaction {
         this._acquiredConfig = null
         this._aborted = true
 
+        publish(CHANNELS.TRANSACTION_ROLLBACK, () => ({
+          transactionId: IDS.get(this),
+          aborted: true
+        }))
         this.emit('rollback', true)
       }
     }

package/lib/udt.js

@@ -44,6 +44,12 @@ const SEGMENT = {
   FIRST_ARC: 0x03
 }; */
 
+const ensureBytes = (buffer, needed) => {
+  if (buffer.position + needed > buffer.length) {
+    throw new Error(`Corrupt or truncated spatial data: expected ${needed} bytes at position ${buffer.position}, but only ${buffer.length - buffer.position} bytes remain`)
+  }
+}
+
 class Point {
   constructor () {
     this.x = 0
@@ -64,6 +70,8 @@ const parsePoints = (buffer, count, isGeometryPoint) => {
     return points
   }
 
+  ensureBytes(buffer, count * 16)
+
   if (isGeometryPoint) {
     // GEOMETRY POINT (s2.1.6): x then y.
     for (let i = 1; i <= count; i++) {
@@ -101,6 +109,8 @@ const parseZ = (buffer, points) => {
     return
   }
 
+  ensureBytes(buffer, points.length * 8)
+
   points.forEach(point => {
     point.z = buffer.readDoubleLE(buffer.position)
     buffer.position += 8
@@ -114,6 +124,8 @@ const parseM = (buffer, points) => {
     return
   }
 
+  ensureBytes(buffer, points.length * 8)
+
   points.forEach(point => {
     point.m = buffer.readDoubleLE(buffer.position)
     buffer.position += 8
@@ -139,6 +151,8 @@ const parseFigures = (buffer, count, properties) => {
       pointOffset: 0
     })
   } else {
+    ensureBytes(buffer, count * 5)
+
     for (let i = 1; i <= count; i++) {
       figures.push({
         attribute: buffer.readUInt8(buffer.position),
@@ -173,6 +187,8 @@ const parseShapes = (buffer, count, properties) => {
       type: 0x02
     })
   } else {
+    ensureBytes(buffer, count * 9)
+
     for (let i = 1; i <= count; i++) {
       shapes.push({
         parentOffset: buffer.readInt32LE(buffer.position),
@@ -195,6 +211,8 @@ const parseSegments = (buffer, count) => {
     return segments
   }
 
+  ensureBytes(buffer, count)
+
   for (let i = 1; i <= count; i++) {
     segments.push({ type: buffer.readUInt8(buffer.position) })
 
@@ -207,6 +225,8 @@ const parseSegments = (buffer, count) => {
 const parseGeography = (buffer, isUsingGeometryPoints) => {
   // s2.1.1 + s.2.1.2
 
+  ensureBytes(buffer, 6)
+
   const srid = buffer.readInt32LE(0)
   if (srid === -1) {
     return null
@@ -220,9 +240,6 @@ const parseGeography = (buffer, isUsingGeometryPoints) => {
   const flags = buffer.readUInt8(5)
   buffer.position = 6
 
-  // console.log("srid", srid)
-  // console.log("version", version)
-
   const properties = {
     Z: (flags & (1 << 0)) > 0,
     M: (flags & (1 << 1)) > 0,
@@ -232,23 +249,20 @@ const parseGeography = (buffer, isUsingGeometryPoints) => {
   }
 
   if (value.version === 2) {
-    properties.H = (flags & (1 << 3)) > 0
+    properties.H = (flags & (1 << 5)) > 0
   }
 
-  // console.log("properties", properties);
-
   let numberOfPoints
   if (properties.P) {
     numberOfPoints = 1
   } else if (properties.L) {
     numberOfPoints = 2
   } else {
+    ensureBytes(buffer, 4)
     numberOfPoints = buffer.readUInt32LE(buffer.position)
     buffer.position += 4
   }
 
-  // console.log("numberOfPoints", numberOfPoints)
-
   value.points = parsePoints(buffer, numberOfPoints, isUsingGeometryPoints)
 
   if (properties.Z) {
@@ -259,49 +273,37 @@ const parseGeography = (buffer, isUsingGeometryPoints) => {
     parseM(buffer, value.points)
   }
 
-  // console.log("points", points)
-
   let numberOfFigures
   if (properties.P) {
     numberOfFigures = 1
   } else if (properties.L) {
     numberOfFigures = 1
   } else {
+    ensureBytes(buffer, 4)
     numberOfFigures = buffer.readUInt32LE(buffer.position)
     buffer.position += 4
   }
 
-  // console.log("numberOfFigures", numberOfFigures)
-
   value.figures = parseFigures(buffer, numberOfFigures, properties)
 
-  // console.log("figures", figures)
-
   let numberOfShapes
   if (properties.P) {
     numberOfShapes = 1
   } else if (properties.L) {
     numberOfShapes = 1
   } else {
+    ensureBytes(buffer, 4)
     numberOfShapes = buffer.readUInt32LE(buffer.position)
     buffer.position += 4
   }
 
-  // console.log("numberOfShapes", numberOfShapes)
-
   value.shapes = parseShapes(buffer, numberOfShapes, properties)
 
-  // console.log( "shapes", shapes)
-
-  if (value.version === 2 && buffer.position < buffer.length) {
+  if (value.version === 2 && buffer.position + 4 <= buffer.length) {
     const numberOfSegments = buffer.readUInt32LE(buffer.position)
     buffer.position += 4
 
-    // console.log("numberOfSegments", numberOfSegments)
-
     value.segments = parseSegments(buffer, numberOfSegments)
-
-    // console.log("segments", segments)
   } else {
     value.segments = []
   }

package/lib/utils.js

@@ -9,6 +9,14 @@ const INCREMENT = {
   PreparedStatement: 1
 }
 
+const getPoolId = (obj) => {
+  let parent = obj && obj.parent
+  while (parent && !parent.pool) {
+    parent = parent.parent
+  }
+  return parent ? IDS.get(parent) : undefined
+}
+
 module.exports = {
   objectHasProperty: (object, property) => Object.prototype.hasOwnProperty.call(object, property),
   INCREMENT,
@@ -18,5 +26,6 @@ module.exports = {
       if (id) return IDS.set(object, id)
       IDS.set(object, INCREMENT[type]++)
     }
-  }
+  },
+  getPoolId
 }

package/package.json

@@ -21,7 +21,7 @@
     "azure",
     "node-mssql"
   ],
-  "version": "12.3.0",
+  "version": "12.4.0",
   "main": "index.js",
   "type": "commonjs",
   "repository": {
@@ -52,7 +52,7 @@
     "standard": "^17.0.0"
   },
   "engines": {
-    "node": ">=18"
+    "node": ">=18.19.0"
   },
   "files": [
     "lib/",