mssql 8.1.1 → 9.0.0

package/CHANGELOG.txt

@@ -1,3 +1,17 @@
+v9.0.0 (2022-08-10)
+-------------------
+[change] Upgrade tedious to v15 ([#1417](https://github.com/tediousjs/node-mssql/pull/1417))
+[removed] Removed NodeJS 10 & 12 support ([#1417](https://github.com/tediousjs/node-mssql/pull/1417))
+
+v8.1.3 (2022-08-08)
+-------------------
+[fix] requestTimeout correctly resolved ([#1398](https://github.com/tediousjs/node-mssql/pull/1398))
+[fix] Forcibly deny use of `useColumnNames` tedious config option that can be passed in the config object ([#1416](https://github.com/tediousjs/node-mssql/pull/1416))
+
+v8.1.2 (2022-05-27)
+-------------------
+[fix] quote identifiers in table constraint declaration ([#1397](https://github.com/tediousjs/node-mssql/pull/1397))
+
 v8.1.1 (2022-05-18)
 -------------------
 [fix] quote identifiers in table primary keys ([#1394](https://github.com/tediousjs/node-mssql/pull/1394))
@@ -30,6 +44,10 @@ v8.0.0 (2022-01-30)
 [removed] Remove connection string parser helpers ((#1342)[https://github.com/tediousjs/node-mssql/pull/1342])
 [removed] Remove deprecated pool properties ((#1359)[https://github.com/tediousjs/node-mssql/pull/1359])
 
+v7.3.5 (2022-05-27)
+-------------------
+[fix] quote identifiers in table constraint declaration ([#1397](https://github.com/tediousjs/node-mssql/pull/1397))
+
 v7.3.4 (2022-05-18)
 -------------------
 [fix] msnodesqlv8.js file was missing from previous release

package/README.md

@@ -2025,6 +2025,11 @@ request.query('select @myval as myval', (err, result) => {
 - If you're facing problems with connecting SQL Server 2000, try setting the default TDS version to 7.1 with `config.options.tdsVersion = '7_1'` ([issue](https://github.com/tediousjs/node-mssql/issues/36))
 - If you're executing a statement longer than 4000 chars on SQL Server 2000, always use [batch](#batch-batch-callback) instead of [query](#query-command-callback) ([issue](https://github.com/tediousjs/node-mssql/issues/68))
 
+## 8.x to 7.x changes
+
+- Upgraded to tedious version 15
+- Dropped support for Node version < 12
+
 ## 7.x to 8.x changes
 
 - Upgraded to tedious version 14

package/lib/base/connection-pool.js

@@ -8,6 +8,7 @@ const { IDS } = require('../utils')
 const ConnectionError = require('../error/connection-error')
 const shared = require('../shared')
 const clone = require('rfdc/default')
+const { MSSQLError } = require('../error')
 
 /**
  * Class ConnectionPool.
@@ -68,6 +69,14 @@ class ConnectionPool extends EventEmitter {
       this.config.options.instanceName = RegExp.$2
     }
 
+    if (typeof this.config.options.useColumnNames !== 'undefined' && this.config.options.useColumnNames !== true) {
+      const ex = new MSSQLError('Invalid options `useColumnNames`, use `arrayRowMode` instead')
+      if (typeof callback === 'function') {
+        return setImmediate(callback, ex)
+      }
+      throw ex
+    }
+
     if (typeof callback === 'function') {
       this.connect(callback)
     }

package/lib/base/request.js

@@ -48,7 +48,7 @@ class Request extends EventEmitter {
   }
 
   /**
-   * Generate sql string and set imput parameters from tagged template string.
+   * Generate sql string and set input parameters from tagged template string.
    *
    * @param {Template literal} template
    * @return {String}

package/lib/msnodesqlv8/connection-pool.js

@@ -21,13 +21,11 @@ class ConnectionPool extends BaseConnectionPool {
         defaultConnectionString = CONNECTION_STRING_NAMED_INSTANCE
       }
 
-      if (this.config.requestTimeout == null) {
-        this.config.requestTimeout = 15000
-      }
+      this.config.requestTimeout = this.config.requestTimeout || this.config.timeout || 15000
 
       const cfg = {
         conn_str: this.config.connectionString || defaultConnectionString,
-        conn_timeout: (this.config.connectionTimeout || 15000) / 1000
+        conn_timeout: (this.config.connectionTimeout || this.config.timeout || 15000) / 1000
       }
 
       cfg.conn_str = cfg.conn_str.replace(/#{([^}]*)}/g, (p) => {

package/lib/msnodesqlv8/request.js

@@ -369,7 +369,7 @@ class Request extends BaseRequest {
           }
           const param = this.parameters[name]
           if (param.io === 1 || (param.io === 2 && param.value)) {
-            params.push(castParameter(param.value, param.type, param))
+            params.push(castParameter(param.value, param.type))
           }
         }
 

package/lib/table.js

@@ -116,7 +116,7 @@ Table.prototype.declare = function declare () {
     return def.join(' ')
   })
 
-  const constraint = pkey.length > 1 ? `, constraint PK_${this.temporary ? this.name.substr(1) : this.name} primary key (${pkey.join(', ')})` : ''
+  const constraint = pkey.length > 1 ? `, constraint [PK_${this.temporary ? this.name.substr(1) : this.name}] primary key (${pkey.join(', ')})` : ''
   return `create table ${this.path} (${cols.join(', ')}${constraint})`
 }
 

package/lib/tedious/connection-pool.js

@@ -37,7 +37,7 @@ class ConnectionPool extends BaseConnectionPool {
       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.requestTimeout = cfg.options.requestTimeout || this.config.requestTimeout || this.config.timeout || 15000
       cfg.options.tdsVersion = cfg.options.tdsVersion || '7_4'
       cfg.options.rowCollectionOnDone = cfg.options.rowCollectionOnDone || false
       cfg.options.rowCollectionOnRequestCompletion = cfg.options.rowCollectionOnRequestCompletion || false

package/lib/tedious/request.js

@@ -442,12 +442,15 @@ class Request extends BaseRequest {
         debug('request(%d): query', IDS.get(this), command)
 
         const req = new tds.Request(command, err => {
-          // to make sure we handle no-sql errors as well
-          if (err && (!errors.length || (errors.length && err.message !== errors[errors.length - 1].message))) {
-            err = new RequestError(err, 'EREQUEST')
-            if (this.stream) this.emit('error', err)
-            errors.push(err)
-          }
+          // tedious v15 has started using AggregateErrors to wrap multiple errors into single error objects
+          (err?.errors ? err.errors : [err]).forEach((e, i, { length }) => {
+            // to make sure we handle no-sql errors as well
+            if (e && (!errors.length || (errors.length && errors.length >= length && e.message !== errors[errors.length - length + i].message))) {
+              e = new RequestError(e, 'EREQUEST')
+              if (this.stream) this.emit('error', e)
+              errors.push(e)
+            }
+          })
 
           // process batch outputs
           if (batchHasOutput) {

package/lib/utils.js

@@ -9,7 +9,7 @@ const INCREMENT = {
 
 module.exports = {
   objectHasProperty: (object, property) => Object.prototype.hasOwnProperty.call(object, property),
-  INCREMENT: INCREMENT,
+  INCREMENT,
   IDS: {
     get: IDS.get.bind(IDS),
     add: (object, type, id) => {

package/package.json

@@ -21,21 +21,21 @@
     "azure",
     "node-mssql"
   ],
-  "version": "8.1.1",
+  "version": "9.0.0",
   "main": "index.js",
   "repository": "github:tediousjs/node-mssql",
   "license": "MIT",
   "dependencies": {
-    "@tediousjs/connection-string": "^0.3.0",
-    "commander": "^9.1.0",
+    "@tediousjs/connection-string": "^0.4.1",
+    "commander": "^9.4.0",
     "debug": "^4.3.3",
     "rfdc": "^1.3.0",
     "tarn": "^3.0.2",
-    "tedious": "^14.0.0"
+    "tedious": "^15.0.1"
   },
   "devDependencies": {
-    "mocha": "^9.1.3",
-    "standard": "^16.0.4"
+    "mocha": "^10.0.0",
+    "standard": "^17.0.0"
   },
   "engines": {
     "node": ">=10"