mssql 8.1.1 → 8.1.4

package/CHANGELOG.txt

@@ -1,3 +1,16 @@
+v8.1.4 (2022-08-18)
+-------------------
+[fix] fix regression in requestTimout option not accepting `0` as a value ([#1421](https://github.com/tediousjs/node-mssql/pull/1421))
+
+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 +43,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/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

@@ -12,6 +12,14 @@ const CONNECTION_DRIVER = ['darwin', 'linux'].includes(platform()) ? 'ODBC Drive
 const CONNECTION_STRING_PORT = `Driver=${CONNECTION_DRIVER};Server=#{server},#{port};Database=#{database};Uid=#{user};Pwd=#{password};Trusted_Connection=#{trusted};Encrypt=#{encrypt};`
 const CONNECTION_STRING_NAMED_INSTANCE = `Driver=${CONNECTION_DRIVER};Server=#{server}\\#{instance};Database=#{database};Uid=#{user};Pwd=#{password};Trusted_Connection=#{trusted};Encrypt=#{encrypt};`
 
+function firstDefined () {
+  for (let i = 0; i < arguments.length; i++) {
+    if (typeof arguments[i] !== 'undefined') {
+      return arguments[i]
+    }
+  }
+}
+
 class ConnectionPool extends BaseConnectionPool {
   _poolCreate () {
     return new shared.Promise((resolve, reject) => {
@@ -21,13 +29,11 @@ class ConnectionPool extends BaseConnectionPool {
         defaultConnectionString = CONNECTION_STRING_NAMED_INSTANCE
       }
 
-      if (this.config.requestTimeout == null) {
-        this.config.requestTimeout = 15000
-      }
+      this.config.requestTimeout = firstDefined(this.config.requestTimeout, this.config.timeout, 15000)
 
       const cfg = {
         conn_str: this.config.connectionString || defaultConnectionString,
-        conn_timeout: (this.config.connectionTimeout || 15000) / 1000
+        conn_timeout: firstDefined(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

@@ -7,6 +7,14 @@ const { IDS } = require('../utils')
 const shared = require('../shared')
 const ConnectionError = require('../error/connection-error')
 
+function firstDefined () {
+  for (let i = 0; i < arguments.length; i++) {
+    if (typeof arguments[i] !== 'undefined') {
+      return arguments[i]
+    }
+  }
+}
+
 class ConnectionPool extends BaseConnectionPool {
   _poolCreate () {
     return new shared.Promise((resolve, reject) => {
@@ -36,8 +44,8 @@ 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.connectTimeout = firstDefined(cfg.options.connectTimeout, this.config.connectionTimeout, this.config.timeout, 15000)
+      cfg.options.requestTimeout = firstDefined(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/package.json

@@ -21,7 +21,7 @@
     "azure",
     "node-mssql"
   ],
-  "version": "8.1.1",
+  "version": "8.1.4",
   "main": "index.js",
   "repository": "github:tediousjs/node-mssql",
   "license": "MIT",