switch more to msnodesqlv8

eslint.config.d.ts

@@ -1 +1,3 @@
-export { default } from 'eslint-config-cityssm';
+import { type Config } from 'eslint-config-cityssm';
+declare const config: Config;
+export default config;

eslint.config.js

@@ -1 +1,14 @@
-export { default } from 'eslint-config-cityssm';
+import eslintConfigCityssm, { tseslint } from 'eslint-config-cityssm';
+const config = tseslint.config(...eslintConfigCityssm, {
+    rules: {
+        '@cspell/spellchecker': [
+            'warn',
+            {
+                cspell: {
+                    words: ['cityssm', 'msnodesqlv8', 'nvarchar', 'recordset', 'tseslint']
+                }
+            }
+        ]
+    }
+});
+export default config;

eslint.config.ts

@@ -1 +1,19 @@
-export { default } from 'eslint-config-cityssm'
+import eslintConfigCityssm, {
+  type Config,
+  tseslint
+} from 'eslint-config-cityssm'
+
+const config = tseslint.config(...eslintConfigCityssm, {
+  rules: {
+    '@cspell/spellchecker': [
+      'warn',
+      {
+        cspell: {
+          words: ['cityssm', 'msnodesqlv8', 'nvarchar', 'recordset', 'tseslint']
+        }
+      }
+    ]
+  }
+}) as Config
+
+export default config

index.d.ts

@@ -1,5 +1,5 @@
-import mssql from 'mssql';
-export declare function connect(config: mssql.config): Promise<mssql.ConnectionPool>;
+import msNodeSql from 'mssql/msnodesqlv8.js';
+export declare function connect(config: msNodeSql.config): Promise<msNodeSql.ConnectionPool>;
 export declare function releaseAll(): Promise<void>;
 export declare function getPoolCount(): number;
 declare const _default: {
@@ -8,5 +8,5 @@ declare const _default: {
     getPoolCount: typeof getPoolCount;
 };
 export default _default;
-export * as mssql from 'mssql';
-export type { Bit, BigInt, Decimal, Float, Int, Money, Numeric, SmallInt, SmallMoney, Real, TinyInt, Char, NChar, Text, NText, VarChar, NVarChar, Xml, Time, Date, DateTime, DateTime2, DateTimeOffset, SmallDateTime, UniqueIdentifier, Variant, Binary, VarBinary, Image, UDT, Geography, Geometry, TYPES, ConnectionPool, Transaction, IColumnMetadata, IRecordSet, IResult, ISqlType, config } from 'mssql';
+export * as mssql from 'mssql/msnodesqlv8.js';
+export type { Bit, BigInt, Decimal, Float, Int, Money, Numeric, SmallInt, SmallMoney, Real, TinyInt, Char, NChar, Text, NText, VarChar, NVarChar, Xml, Time, Date, DateTime, DateTime2, DateTimeOffset, SmallDateTime, UniqueIdentifier, Variant, Binary, VarBinary, Image, UDT, Geography, Geometry, TYPES, ConnectionPool, Transaction, IColumnMetadata, IRecordSet, IResult, ISqlType, config } from 'mssql/msnodesqlv8.js';

index.js

@@ -1,21 +1,18 @@
 import Debug from 'debug';
 import exitHook from 'exit-hook';
-import mssql from 'mssql';
 import msNodeSql from 'mssql/msnodesqlv8.js';
 const debug = Debug('mssql-multi-pool:index');
 const POOLS = new Map();
 function getPoolKey(config) {
-    return `${config.user ?? ''}@${config.server}/${config.options?.instanceName ?? ''};${config.database ?? ''};${config.driver ?? 'tedious'}`;
+    return `${config.user ?? ''}@${config.server}/${config.options?.instanceName ?? ''};${config.database ?? ''}`;
 }
 export async function connect(config) {
     const poolKey = getPoolKey(config);
     let pool = POOLS.get(poolKey);
     if (!(pool?.connected ?? false)) {
         debug(`New database connection: ${poolKey}`);
-        pool =
-            (config.driver ?? '') === 'msnodesqlv8'
-                ? await new msNodeSql.ConnectionPool(config).connect()
-                : await new mssql.ConnectionPool(config).connect();
+        pool = new msNodeSql.ConnectionPool(config);
+        await pool.connect();
         POOLS.set(poolKey, pool);
     }
     return pool;
@@ -49,4 +46,4 @@ export default {
     releaseAll,
     getPoolCount
 };
-export * as mssql from 'mssql';
+export * as mssql from 'mssql/msnodesqlv8.js';

index.ts

@@ -1,16 +1,15 @@
 import Debug from 'debug'
 import exitHook from 'exit-hook'
-import mssql from 'mssql'
 import msNodeSql from 'mssql/msnodesqlv8.js'
 
 const debug = Debug('mssql-multi-pool:index')
 
-const POOLS = new Map<string, mssql.ConnectionPool>()
+const POOLS = new Map<string, msNodeSql.ConnectionPool>()
 
-function getPoolKey(config: mssql.config): string {
+function getPoolKey(config: msNodeSql.config): string {
   return `${config.user ?? ''}@${config.server}/${
     config.options?.instanceName ?? ''
-  };${config.database ?? ''};${config.driver ?? 'tedious'}`
+  };${config.database ?? ''}`
 }
 
 /**
@@ -20,23 +19,24 @@ function getPoolKey(config: mssql.config): string {
  * @returns A MSSQL connection pool.
  */
 export async function connect(
-  config: mssql.config
-): Promise<mssql.ConnectionPool> {
+  config: msNodeSql.config
+): Promise<msNodeSql.ConnectionPool> {
+
   const poolKey = getPoolKey(config)
 
   let pool = POOLS.get(poolKey)
 
   if (!(pool?.connected ?? false)) {
     debug(`New database connection: ${poolKey}`)
 
-    pool =
-      (config.driver ?? '') === 'msnodesqlv8'
-        ? await new msNodeSql.ConnectionPool(config).connect()
-        : await new mssql.ConnectionPool(config).connect()
+    pool = new msNodeSql.ConnectionPool(config)
+
+    await pool.connect()
+
     POOLS.set(poolKey, pool)
   }
 
-  return pool as mssql.ConnectionPool
+  return pool as msNodeSql.ConnectionPool
 }
 
 /**
@@ -90,7 +90,7 @@ export default {
   getPoolCount
 }
 
-export * as mssql from 'mssql'
+export * as mssql from 'mssql/msnodesqlv8.js'
 
 export type {
   Bit,
@@ -133,4 +133,4 @@ export type {
   IResult,
   ISqlType,
   config
-} from 'mssql'
+} from 'mssql/msnodesqlv8.js'

package.json

@@ -37,6 +37,7 @@
   },
   "devDependencies": {
     "@types/debug": "^4.1.12",
+    "@types/node": "^22.7.6",
     "cross-env": "^7.0.3",
     "eslint-config-cityssm": "^13.0.0",
     "prettier-config-cityssm": "^1.0.0"

test/test.js

@@ -3,8 +3,8 @@ import { after, describe, it } from 'node:test';
 import { connect, getPoolCount, releaseAll } from '../index.js';
 import { config } from './config.test.js';
 await describe('mssql-multi-pool', async () => {
-    after(async () => {
-        await releaseAll();
+    after(() => {
+        void releaseAll();
     });
     await it('Connects to database', async () => {
         const pool = await connect(config);

test/test.ts

@@ -6,8 +6,8 @@ import { connect, getPoolCount, releaseAll } from '../index.js'
 import { config } from './config.test.js'
 
 await describe('mssql-multi-pool', async () => {
-  after(async () => {
-    await releaseAll()
+  after(() => {
+    void releaseAll()
   })
 
   await it('Connects to database', async () => {