mssql 12.7.2 → 12.7.3

package/lib/msnodesqlv8/request.js

@@ -302,7 +302,7 @@ class Request extends BaseRequest {
     })
   }
 
-  _query (command, callback) {
+  _query (command, callback, bound) {
     super._query(command, err => {
       if (err) return callback(err)
 
@@ -392,7 +392,9 @@ class Request extends BaseRequest {
             continue
           }
           const param = this.parameters[name]
-          if (param.io === 1) {
+          // an output's initial value is bound with the inputs below, so it needs a marker too;
+          // an output given no value is null, and 0, '' and false are values like any other
+          if (param.io === 1 || (param.io === 2 && param.value != null)) {
             sets.push(`set @${param.name}=?`)
           }
         }
@@ -426,15 +428,23 @@ class Request extends BaseRequest {
           return callback(new RequestError('Canceled.', 'ECANCEL'))
         }
 
+        // values are bound to the markers by position, so a caller that writes its own
+        // markers passes the parameters in the order it wrote them
         const params = []
-        for (const name in this.parameters) {
-          if (!objectHasProperty(this.parameters, name)) {
-            continue
-          }
-          const param = this.parameters[name]
-          if (param.io === 1 || (param.io === 2 && param.value)) {
+        if (bound) {
+          for (const param of bound) {
             params.push(castParameter(param.value, param.type))
           }
+        } else {
+          for (const name in this.parameters) {
+            if (!objectHasProperty(this.parameters, name)) {
+              continue
+            }
+            const param = this.parameters[name]
+            if (param.io === 1 || (param.io === 2 && param.value != null)) {
+              params.push(castParameter(param.value, param.type))
+            }
+          }
         }
 
         debug('request(%d): query', IDS.get(this), command)
@@ -726,6 +736,10 @@ class Request extends BaseRequest {
         return callback(new RequestError(e, 'EREQUEST'))
       }
 
+      // the parameters in the order their markers are written: output initial values are set
+      // before the call and inputs are passed to it, whatever order they were declared in
+      const bound = []
+
       // set output params w/ values
       const sets = []
       for (const name in this.parameters) {
@@ -733,8 +747,9 @@ class Request extends BaseRequest {
           continue
         }
         const param = this.parameters[name]
-        if (param.io === 2 && param.value) {
+        if (param.io === 2 && param.value != null) {
           sets.push(`set @${param.name}=?`)
+          bound.push(param)
         }
       }
 
@@ -754,6 +769,7 @@ class Request extends BaseRequest {
         } else {
           // input parameter
           spp.push(`@${param.name}=?`)
+          bound.push(param)
         }
       }
 
@@ -829,7 +845,7 @@ class Request extends BaseRequest {
         } else {
           callback(null, recordsets, output, returnValue, rowsAffected, recordsetcolumns)
         }
-      })
+      }, bound)
     })
   }
 

package/lib/tedious/request.js

@@ -12,6 +12,7 @@ const { valueHandler } = require('../shared')
 
 const JSON_COLUMN_ID = 'JSON_F52E2B61-18A1-11d1-B105-00805F49916B'
 const XML_COLUMN_ID = 'XML_F52E2B61-18A1-11d1-B105-00805F49916B'
+const MAX = 65535 // (1 << 16) - 1
 
 const N_TYPES = {
   BitN: 0x68,
@@ -174,6 +175,18 @@ const valueCorrection = function (value, metadata) {
   }
 }
 
+// tedious only compares a length as a number, so `max` is passed as the length it stands
+// for. As a word it compares false against the type's maximum both ways, and tedious then
+// writes a `max` value without its terminator.
+const tediousLength = function (length) {
+  return typeof length === 'string' && length.trim().toLowerCase() === 'max' ? MAX : length
+}
+
+// tedious writes a TVP column with the length it is given, without resolving a missing one,
+// and a missing length fails the same comparisons as `max`. These types are given `max`,
+// which is how tedious wrote them before it compared the length both ways.
+const MAX_LENGTH_TYPES = new Set([tds.TYPES.NVarChar, tds.TYPES.VarChar, tds.TYPES.VarBinary])
+
 const parameterCorrection = function (value) {
   if (value instanceof Table) {
     const tvp = {
@@ -191,7 +204,7 @@ const parameterCorrection = function (value) {
       tvp.columns.push({
         name: col.name,
         type: tediousType,
-        length: col.length,
+        length: col.length == null && MAX_LENGTH_TYPES.has(tediousType) ? MAX : tediousLength(col.length),
         scale: col.scale,
         precision: col.precision
       })
@@ -368,7 +381,7 @@ class Request extends BaseRequest {
             // tedious emits this name as a quoted identifier of its own when it builds
             // the `insert bulk` statement, so it is checked here as well as in
             // Table#declare, in case the name changed since it was checked above.
-            bulk.addColumn(assertSafeColumnName(col.name), getTediousType(col.type), { nullable: col.nullable, length: assertSafeTypeSize(col.length), scale: assertSafeTypeSize(col.scale), precision: assertSafeTypeSize(col.precision) })
+            bulk.addColumn(assertSafeColumnName(col.name), getTediousType(col.type), { nullable: col.nullable, length: tediousLength(assertSafeTypeSize(col.length)), scale: assertSafeTypeSize(col.scale), precision: assertSafeTypeSize(col.precision) })
           }
 
           if (table.create) {
@@ -773,9 +786,9 @@ class Request extends BaseRequest {
               // tedious builds the sp_executesql declaration from these, so a rejected size
               // has to be reported through the path that releases the connection
               if (param.io === 1) {
-                req.addParameter(param.name, getTediousType(param.type), parameterCorrection(param.value), { length: assertSafeTypeSize(param.length), scale: assertSafeTypeSize(param.scale), precision: assertSafeTypeSize(param.precision) })
+                req.addParameter(param.name, getTediousType(param.type), parameterCorrection(param.value), { length: tediousLength(assertSafeTypeSize(param.length)), scale: assertSafeTypeSize(param.scale), precision: assertSafeTypeSize(param.precision) })
               } else {
-                req.addOutputParameter(param.name, getTediousType(param.type), parameterCorrection(param.value), { length: assertSafeTypeSize(param.length), scale: assertSafeTypeSize(param.scale), precision: assertSafeTypeSize(param.precision) })
+                req.addOutputParameter(param.name, getTediousType(param.type), parameterCorrection(param.value), { length: tediousLength(assertSafeTypeSize(param.length)), scale: assertSafeTypeSize(param.scale), precision: assertSafeTypeSize(param.precision) })
               }
             }
           }
@@ -1093,9 +1106,9 @@ class Request extends BaseRequest {
             }
             const param = this.parameters[name]
             if (param.io === 1) {
-              req.addParameter(param.name, getTediousType(param.type), parameterCorrection(param.value), { length: assertSafeTypeSize(param.length), scale: assertSafeTypeSize(param.scale), precision: assertSafeTypeSize(param.precision) })
+              req.addParameter(param.name, getTediousType(param.type), parameterCorrection(param.value), { length: tediousLength(assertSafeTypeSize(param.length)), scale: assertSafeTypeSize(param.scale), precision: assertSafeTypeSize(param.precision) })
             } else {
-              req.addOutputParameter(param.name, getTediousType(param.type), parameterCorrection(param.value), { length: assertSafeTypeSize(param.length), scale: assertSafeTypeSize(param.scale), precision: assertSafeTypeSize(param.precision) })
+              req.addOutputParameter(param.name, getTediousType(param.type), parameterCorrection(param.value), { length: tediousLength(assertSafeTypeSize(param.length)), scale: assertSafeTypeSize(param.scale), precision: assertSafeTypeSize(param.precision) })
             }
           }
 

package/package.json

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