mssql 7.1.3 → 8.0.0

package/lib/msnodesqlv8/request.js

@@ -8,6 +8,7 @@ const { IDS, objectHasProperty } = require('../utils')
 const { TYPES, DECLARATIONS, declare } = require('../datatypes')
 const { PARSERS: UDT } = require('../udt')
 const Table = require('../table')
+const { valueHandler } = require('../shared')
 
 const JSON_COLUMN_ID = 'JSON_F52E2B61-18A1-11d1-B105-00805F49916B'
 const XML_COLUMN_ID = 'XML_F52E2B61-18A1-11d1-B105-00805F49916B'
@@ -122,7 +123,12 @@ const createColumns = function (metadata, arrayRowMode) {
 }
 
 const valueCorrection = function (value, metadata) {
-  if ((metadata.sqlType === 'time') && (value != null)) {
+  const type = metadata && objectHasProperty(metadata, 'sqlType') && objectHasProperty(DECLARATIONS, metadata.sqlType)
+    ? DECLARATIONS[metadata.sqlType]
+    : null
+  if (type && valueHandler.has(type)) {
+    return valueHandler.get(type)(value)
+  } else if ((metadata.sqlType === 'time') && (value != null)) {
     value.setFullYear(1970)
     return value
   } else if ((metadata.sqlType === 'udt') && (value != null)) {
@@ -146,7 +152,11 @@ class Request extends BaseRequest {
     super._bulk(table, options, err => {
       if (err) return callback(err)
 
-      table._makeBulk()
+      try {
+        table._makeBulk()
+      } catch (e) {
+        return callback(new RequestError(e, 'EREQUEST'))
+      }
 
       if (!table.name) {
         setImmediate(callback, new RequestError('Table name must be specified for bulk insert.', 'ENAME'))
@@ -358,7 +368,7 @@ class Request extends BaseRequest {
             continue
           }
           const param = this.parameters[name]
-          if (param.io === 1) {
+          if (param.io === 1 || (param.io === 2 && param.value)) {
             params.push(castParameter(param.value, param.type, param))
           }
         }
@@ -633,7 +643,19 @@ class Request extends BaseRequest {
         }
       }
 
-      let cmd = `declare ${['@___return___ int'].concat(params).join(', ')};`
+      // set output params w/ values
+      const sets = []
+      for (const name in this.parameters) {
+        if (!objectHasProperty(this.parameters, name)) {
+          continue
+        }
+        const param = this.parameters[name]
+        if (param.io === 2 && param.value) {
+          sets.push(`set @${param.name}=?`)
+        }
+      }
+
+      let cmd = `declare ${['@___return___ int'].concat(params).join(', ')};${sets.join(';')};`
       cmd += `exec @___return___ = ${procedure} `
 
       const spp = []

package/lib/shared.js

@@ -105,3 +105,10 @@ Object.defineProperty(module.exports, 'Promise', {
     PromiseLibrary = value
   }
 })
+
+Object.defineProperty(module.exports, 'valueHandler', {
+  enumerable: true,
+  value: new Map(),
+  writable: false,
+  configurable: false
+})

package/lib/table.js

@@ -48,6 +48,13 @@ function Table (name) {
     }
   }
   )
+
+  Object.defineProperty(this.rows, 'clear', {
+    value () {
+      return this.splice(0, this.length)
+    }
+  }
+  )
 }
 
 /*

package/lib/tedious/connection-pool.js

@@ -34,24 +34,23 @@ class ConnectionPool extends BaseConnectionPool {
         }, this.config.authentication)
       }
 
-      cfg.options.database = this.config.database
-      cfg.options.port = this.config.port
-      cfg.options.connectTimeout = this.config.connectionTimeout || this.config.timeout || 15000
-      cfg.options.requestTimeout = this.config.requestTimeout != null ? this.config.requestTimeout : 15000
+      cfg.options.database = cfg.options.database || this.config.database
+      cfg.options.port = cfg.options.port || this.config.port
+      cfg.options.connectTimeout = cfg.options.connectTimeout || this.config.connectionTimeout || this.config.timeout || 15000
+      cfg.options.requestTimeout = cfg.options.requestTimeout || this.config.requestTimeout != null ? this.config.requestTimeout : 15000
       cfg.options.tdsVersion = cfg.options.tdsVersion || '7_4'
-      cfg.options.rowCollectionOnDone = false
-      cfg.options.rowCollectionOnRequestCompletion = false
-      cfg.options.useColumnNames = false
+      cfg.options.rowCollectionOnDone = cfg.options.rowCollectionOnDone || false
+      cfg.options.rowCollectionOnRequestCompletion = cfg.options.rowCollectionOnRequestCompletion || false
+      cfg.options.useColumnNames = cfg.options.useColumnNames || false
       cfg.options.appName = cfg.options.appName || 'node-mssql'
 
       // tedious always connect via tcp when port is specified
       if (cfg.options.instanceName) delete cfg.options.port
 
       if (isNaN(cfg.options.requestTimeout)) cfg.options.requestTimeout = 15000
-      if (cfg.options.requestTimeout === Infinity) cfg.options.requestTimeout = 0
-      if (cfg.options.requestTimeout < 0) cfg.options.requestTimeout = 0
+      if (cfg.options.requestTimeout === Infinity || cfg.options.requestTimeout < 0) cfg.options.requestTimeout = 0
 
-      if (this.config.debug) {
+      if (!cfg.options.debug && this.config.debug) {
         cfg.options.debug = {
           packet: true,
           token: true,
@@ -73,6 +72,7 @@ class ConnectionPool extends BaseConnectionPool {
         }
 
         debug('connection(%d): established', IDS.get(tedious))
+        this.collation = tedious.databaseCollation
         resolveOnce(tedious)
       })
       IDS.add(tedious, 'Connection')

package/lib/tedious/index.js

@@ -22,6 +22,13 @@ Object.defineProperty(module.exports, 'Promise', {
   }
 })
 
+Object.defineProperty(module.exports, 'valueHandler', {
+  enumerable: true,
+  value: base.valueHandler,
+  writable: false,
+  configurable: false
+})
+
 base.driver.name = 'tedious'
 base.driver.ConnectionPool = ConnectionPool
 base.driver.Transaction = Transaction

package/lib/tedious/request.js

@@ -8,6 +8,7 @@ const { IDS, objectHasProperty } = require('../utils')
 const { TYPES, DECLARATIONS, declare, cast } = require('../datatypes')
 const Table = require('../table')
 const { PARSERS: UDT } = require('../udt')
+const { valueHandler } = require('../shared')
 
 const JSON_COLUMN_ID = 'JSON_F52E2B61-18A1-11d1-B105-00805F49916B'
 const XML_COLUMN_ID = 'XML_F52E2B61-18A1-11d1-B105-00805F49916B'
@@ -159,7 +160,10 @@ const createColumns = function (metadata, arrayRowMode) {
 }
 
 const valueCorrection = function (value, metadata) {
-  if ((metadata.type === tds.TYPES.UDT) && (value != null)) {
+  const type = getMssqlType(metadata.type)
+  if (valueHandler.has(type)) {
+    return valueHandler.get(type)(value)
+  } else if ((metadata.type === tds.TYPES.UDT) && (value != null)) {
     if (UDT[metadata.udtInfo.typeName]) {
       return UDT[metadata.udtInfo.typeName](value)
     } else {
@@ -213,7 +217,11 @@ class Request extends BaseRequest {
     super._bulk(table, options, err => {
       if (err) return callback(err)
 
-      table._makeBulk()
+      try {
+        table._makeBulk()
+      } catch (e) {
+        return callback(new RequestError(e, 'EREQUEST'))
+      }
 
       if (!table.name) {
         return callback(new RequestError('Table name must be specified for bulk insert.', 'ENAME'))
@@ -266,14 +274,21 @@ class Request extends BaseRequest {
       }
 
       this.parent.acquire(this, (err, connection) => {
-        if (err) return callback(err)
+        const callbackWithRelease = (err, ...args) => {
+          try {
+            this.parent.release(connection)
+          } catch (e) {
+            // noop
+          }
+          callback(err, ...args)
+        }
+        if (err) return callbackWithRelease(err)
 
         debug('connection(%d): borrowed to request #%d', IDS.get(connection), IDS.get(this))
 
         if (this.canceled) {
           debug('request(%d): canceled', IDS.get(this))
-          this.parent.release(connection)
-          return callback(new RequestError('Canceled.', 'ECANCEL'))
+          return callbackWithRelease(new RequestError('Canceled.', 'ECANCEL'))
         }
 
         this._cancel = () => {
@@ -307,13 +322,12 @@ class Request extends BaseRequest {
               connection.removeListener(event, errorHandlers[event])
             }
 
-            this.parent.release(connection)
             hasReturned = true
 
             if (this.stream) {
-              callback(null, rowCount)
+              callbackWithRelease(null, rowCount)
             } else {
-              callback(error, rowCount)
+              callbackWithRelease(error, rowCount)
             }
           }
         }
@@ -324,22 +338,18 @@ class Request extends BaseRequest {
           bulk.addColumn(col.name, getTediousType(col.type), { nullable: col.nullable, length: col.length, scale: col.scale, precision: col.precision })
         }
 
-        for (const row of table.rows) {
-          bulk.addRow(row)
-        }
-
         if (table.create) {
           const objectid = table.temporary ? `tempdb..[${table.name}]` : table.path
           const req = new tds.Request(`if object_id('${objectid.replace(/'/g, '\'\'')}') is null ${table.declare()}`, err => {
             if (err) return done(err)
 
-            connection.execBulkLoad(bulk)
+            connection.execBulkLoad(bulk, table.rows)
           })
           this._setCurrentRequest(req)
 
           connection.execSqlBatch(req)
         } else {
-          connection.execBulkLoad(bulk)
+          connection.execBulkLoad(bulk, table.rows)
         }
       })
     })
@@ -594,7 +604,7 @@ class Request extends BaseRequest {
               row.push(col.value)
             } else {
               const exi = row[col.metadata.colName]
-              if (exi != null) {
+              if (exi !== undefined) {
                 if (exi instanceof Array) {
                   exi.push(col.value)
                 } else {
@@ -631,7 +641,7 @@ class Request extends BaseRequest {
               const param = this.parameters[name]
 
               try {
-                param.value = getTediousType(param.type).validate(param.value)
+                param.value = getTediousType(param.type).validate(param.value, this.parent.collation)
               } catch (e) {
                 e.message = `Validation failed for parameter '${name}'. ${e.message}`
                 const err = new RequestError(e, 'EPARAM')

package/lib/udt.js

@@ -53,20 +53,42 @@ class Point {
   }
 }
 
-const parsePoints = (buffer, count) => {
+const parsePoints = (buffer, count, isGeometryPoint) => {
   // s2.1.5 + s2.1.6
+  // The key distinction for parsing is that a GEOGRAPHY POINT is ordered Lat (y) then Long (x),
+  // while a GEOMETRY POINT is ordered x then y.
+  // Further, there are additional range constraints on GEOGRAPHY POINT that are useful for testing that the coordinate order has not been flipped, such as that Lat must be in the range [-90, +90].
 
   const points = []
   if (count < 1) {
     return points
   }
 
-  for (let i = 1; i <= count; i++) {
-    const point = new Point()
-    points.push(point)
-    point.x = buffer.readDoubleLE(buffer.position)
-    point.y = buffer.readDoubleLE(buffer.position + 8)
-    buffer.position += 16
+  if (isGeometryPoint) {
+    // GEOMETRY POINT (s2.1.6): x then y.
+    for (let i = 1; i <= count; i++) {
+      const point = new Point()
+      points.push(point)
+      point.x = buffer.readDoubleLE(buffer.position)
+      point.y = buffer.readDoubleLE(buffer.position + 8)
+      buffer.position += 16
+    }
+  } else {
+    // GEOGRAPHY POINT (s2.1.5): Lat (y) then Long (x).
+    for (let i = 1; i <= count; i++) {
+      const point = new Point()
+      points.push(point)
+      point.lat = buffer.readDoubleLE(buffer.position)
+      point.lng = buffer.readDoubleLE(buffer.position + 8)
+
+      // For backwards compatibility, preserve the coordinate inversion in x and y.
+      // A future breaking change likely eliminate x and y for geography points in favor of just the lat and lng fields, as they've proven marvelously confusing.
+      // See discussion at: https://github.com/tediousjs/node-mssql/pull/1282#discussion_r677769531
+      point.x = point.lat
+      point.y = point.lng
+
+      buffer.position += 16
+    }
   }
 
   return points
@@ -182,7 +204,7 @@ const parseSegments = (buffer, count) => {
   return segments
 }
 
-const parseGeography = buffer => {
+const parseGeography = (buffer, isUsingGeometryPoints) => {
   // s2.1.1 + s.2.1.2
 
   const srid = buffer.readInt32LE(0)
@@ -227,7 +249,7 @@ const parseGeography = buffer => {
 
   // console.log("numberOfPoints", numberOfPoints)
 
-  value.points = parsePoints(buffer, numberOfPoints)
+  value.points = parsePoints(buffer, numberOfPoints, isUsingGeometryPoints)
 
   if (properties.Z) {
     parseZ(buffer, value.points)
@@ -289,10 +311,10 @@ const parseGeography = buffer => {
 
 module.exports.PARSERS = {
   geography (buffer) {
-    return parseGeography(buffer)
+    return parseGeography(buffer, /* isUsingGeometryPoints: */false)
   },
 
   geometry (buffer) {
-    return parseGeography(buffer)
+    return parseGeography(buffer, /* isUsingGeometryPoints: */true)
   }
 }

package/package.json

@@ -21,20 +21,20 @@
     "azure",
     "node-mssql"
   ],
-  "version": "7.1.3",
+  "version": "8.0.0",
   "main": "index.js",
   "repository": "github:tediousjs/node-mssql",
   "license": "MIT",
   "dependencies": {
     "@tediousjs/connection-string": "^0.3.0",
-    "debug": "^4",
+    "debug": "^4.3.3",
     "rfdc": "^1.3.0",
-    "tarn": "^3.0.1",
-    "tedious": "^11.0.7"
+    "tarn": "^3.0.2",
+    "tedious": "^14.0.0"
   },
   "devDependencies": {
-    "mocha": "^8.3.2",
-    "standard": "^16.0.3"
+    "mocha": "^9.1.3",
+    "standard": "^16.0.4"
   },
   "engines": {
     "node": ">=10"

package/test.js

@@ -20,28 +20,21 @@ const sqlConfig = {
   },
   port: 1433,
   user: 'sa',
-  server: 'localhost'
-};
+  server: 'localhost',
+  arrayRowMode: true
+}
 
-(async () => {
-  const pool = new mssql.ConnectionPool(sqlConfig)
-  try {
-    await pool.connect();
-
-    const  request = pool.request();
-    request.arrayRowMode = true;
-    request.multiple = true;
-
-    const result = await request.batch('SELECT 1;');
-
-    Object.entries(result.recordset.columns).forEach(([key, value]) => {
-      console.log(`Column: ${key}, ${JSON.stringify(value)}`);
-    });
-  } catch (err) {
-    console.error(err)
-  } finally {
-    console.log('closing pool')
-    await pool.close()
-    console.log('closed')
-  }
-})()
+mssql.connect(sqlConfig).then((pool) => {
+  console.log('Connected to SQL server')
+  const request = pool.request()
+  request.stream = true
+  request.on('error', (err) => {
+    console.error('good', err)
+  })
+  return request.query('SELECT * FROM nontable')
+}).catch((err) => {
+  console.error('bad', err)
+}).then(() => {
+  console.log('Disconnecting from SQL server')
+  return mssql.close()
+}).then(() => console.log('Disconnected'))