Merge pull request #1750 from dhensby/pulls/connection-string

chore(deps): upgrade @tediousjs/connection-string to v1.0.0

Author: dhensby

lib/base/connection-pool.js

@@ -2,7 +2,7 @@
 
 const { EventEmitter } = require('node:events')
 const debug = require('debug')('mssql:base')
-const { parseSqlConnectionString } = require('@tediousjs/connection-string')
+const { parse, MSSQL_SCHEMA } = require('@tediousjs/connection-string')
 const tarn = require('tarn')
 const { IDS } = require('../utils')
 const ConnectionError = require('../error/connection-error')
@@ -99,6 +99,7 @@ class ConnectionPool extends EventEmitter {
   }
 
   static _parseAuthenticationType (type, entries) {
+    if (!type) return 'default'
     switch (type.toLowerCase()) {
       case 'active directory integrated':
         if (entries.includes('token')) {
@@ -121,7 +122,15 @@ class ConnectionPool extends EventEmitter {
   }
 
   static _parseConnectionString (connectionString) {
-    const parsed = parseSqlConnectionString(connectionString, true, true)
+    const result = parse(connectionString)
+    const parsed = result.toSchema(MSSQL_SCHEMA)
+    // Include non-standard keys (client id, tenant id, token, msi endpoint, msi secret)
+    // that are used for authentication but not part of the MSSQL schema
+    for (const [key, value] of result) {
+      if (!(key in parsed)) {
+        parsed[key] = value
+      }
+    }
     return Object.entries(parsed).reduce((config, [key, value]) => {
       switch (key) {
         case 'application name':

lib/msnodesqlv8/connection-pool.js

@@ -7,7 +7,7 @@ const { IDS, INCREMENT } = require('../utils')
 const shared = require('../shared')
 const ConnectionError = require('../error/connection-error')
 const { platform } = require('node:os')
-const { buildConnectionString } = require('@tediousjs/connection-string')
+const { build } = require('@tediousjs/connection-string')
 
 const DEFAULT_CONNECTION_DRIVER = ['darwin', 'linux'].includes(platform()) ? 'ODBC Driver 17 for SQL Server' : 'SQL Server Native Client 11.0'
 
@@ -22,7 +22,7 @@ class ConnectionPool extends BaseConnectionPool {
       }
 
       if (!this.config.connectionString) {
-        cfg.conn_str = buildConnectionString({
+        cfg.conn_str = build({
           Driver: this.config.driver && this.config.driver !== 'msnodesqlv8' ? this.config.driver : DEFAULT_CONNECTION_DRIVER,
           Server: this.config.options.instanceName ? `${this.config.server}\\${this.config.options.instanceName}` : `${this.config.server},${this.config.port}`,
           Database: this.config.database,

package-lock.json

@@ -34,7 +34,7 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@tediousjs/connection-string": "^0.6.0",
+    "@tediousjs/connection-string": "^1.0.0",
     "commander": "^11.0.0",
     "debug": "^4.3.3",
     "tarn": "^3.0.2",