Merge remote-tracking branch 'origin/9.2.x' into 9.x

tediousjs · Sep 5, 2023 · a702724 · a702724
2 parents b5cf976 + 53fc9ea
commit a702724
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
@@ -1,4 +1,20 @@
-v9.1.3 (2023-??-??)
+v9.3.1 (2023-09-05)
+-------------------
+[fix] Fix bug with msnodesqlv8 connection strings ((#1525)[https://github.com/tediousjs/node-mssql/pull/1525])
+
+v9.3.0 (2023-09-04)
+-------------------
+[new] Add AAD connection support to connection strings ((#1461)[https://github.com/tediousjs/node-mssql/pull/1461])
+
+v9.2.1 (2023-09-05)
+-------------------
+[fix] Fix bug with msnodesqlv8 connection strings ((#1525)[https://github.com/tediousjs/node-mssql/pull/1525])
+
+v9.2.0 (2023-08-28)
+-------------------
+[new] Use @tediousjs/connection-string library to build msnodesqlv8 connection strings ((#1525)[https://github.com/tediousjs/node-mssql/pull/1525])
+
+v9.1.3 (2023-08-08)
 -------------------
 [fix] Escape values that are added to the msnodesqlv8 connection string that we construct ((#1479)[https://github.com/tediousjs/node-mssql/pull/1479])
 

diff --git a/lib/msnodesqlv8/connection-pool.js b/lib/msnodesqlv8/connection-pool.js
@@ -24,7 +24,7 @@ class ConnectionPool extends BaseConnectionPool {
       if (!this.config.connectionString) {
         cfg.conn_str = buildConnectionString({
           Driver: CONNECTION_DRIVER,
-          Server: this.config.options.instanceName ? `${this.config.server}\\${this.config.instanceName}` : `${this.config.server},${this.config.port}`,
+          Server: this.config.options.instanceName ? `${this.config.server}\\${this.config.options.instanceName}` : `${this.config.server},${this.config.port}`,
           Database: this.config.database,
           Uid: this.config.user,
           Pwd: this.config.password,