Merge branch '8'

CHANGELOG.txt

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

lib/msnodesqlv8/connection-pool.js

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

lib/tedious/connection-pool.js

@@ -36,8 +36,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 || this.config.timeout || 15000
+      cfg.options.connectTimeout = cfg.options.connectTimeout ?? this.config.connectionTimeout ?? this.config.timeout ?? 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