test: make it possible to run all tests and versions

Author: kirrg001

plugins/node/instrumentation-tedious/test/api.ts

@@ -16,30 +16,35 @@
 
 import * as assert from 'assert';
 import { promisify } from 'util';
+import * as semver from 'semver';
+
 import type {
   Connection,
   Request,
   TYPES,
-  ConnectionConfiguration,
+  // @ts-ignore
+  ConnectionConfig as ConnectionConfigLegacy,
+  // @ts-ignore
+  ConnectionConfiguration as ConnectionConfigNew,
 } from 'tedious';
 
 type Method = keyof Connection & ('execSql' | 'execSqlBatch' | 'prepare');
+type ConnectionConfig = ConnectionConfigLegacy | ConnectionConfigNew;
+
 export type tedious = {
   Connection: typeof Connection;
   Request: typeof Request;
   TYPES: typeof TYPES;
-  ConnectionConfig: ConnectionConfiguration;
+  ConnectionConfig: ConnectionConfig;
 };
 
-export const makeApi = (tedious: tedious) => {
+export const makeApi = (tedious: tedious, tediousVersion: string) => {
   const fullName = (resource: string) => {
     assert.strictEqual(typeof resource, 'string');
     return `[dbo].[${resource}]`;
   };
 
-  const createConnection = (
-    config: ConnectionConfiguration
-  ): Promise<Connection> => {
+  const createConnection = (config: ConnectionConfig): Promise<Connection> => {
     return new Promise((resolve, reject) => {
       const connection = new tedious.Connection(config);
 
@@ -299,8 +304,16 @@ export const makeApi = (tedious: tedious) => {
 
         if (connection.execBulkLoad.length === 1) {
           // required in <=11.5. not supported in 14
-          const rows = [{ c1: 1 }, { c1: 2, c2: 'hello' }];
-          return connection.execBulkLoad(request, rows);
+          if (semver.lt(tediousVersion, '18.0.0')) {
+            request.addRow({ c1: 1 });
+            request.addRow({ c1: 2, c2: 'hello' });
+            // @ts-ignore
+            return connection.execBulkLoad(request);
+          } else {
+            const rows = [{ c1: 1 }, { c1: 2, c2: 'hello' }];
+            // @ts-ignore
+            return connection.execBulkLoad(request, rows);
+          }
         }
 
         (connection.execBulkLoad as any)(request, [

plugins/node/instrumentation-tedious/test/instrumentation.test.ts

@@ -37,7 +37,7 @@ import {
 import * as assert from 'assert';
 import { TediousInstrumentation } from '../src';
 import makeApi from './api';
-import type { Connection, ConnectionConfiguration } from 'tedious';
+import type { tedious } from './api';
 import * as semver from 'semver';
 
 const port = Number(process.env.MSSQL_PORT) || 1433;
@@ -50,28 +50,30 @@ const instrumentation = new TediousInstrumentation();
 instrumentation.enable();
 instrumentation.disable();
 
-const config: ConnectionConfiguration & { userName: string; password: string } =
-  {
-    userName: user,
-    password,
-    server: host,
-    authentication: {
-      type: 'default',
-      options: {
-        userName: user,
-        password,
-      },
-    },
+const config: tedious['ConnectionConfig'] & {
+  userName: string;
+  password: string;
+} = {
+  userName: user,
+  password,
+  server: host,
+  authentication: {
+    type: 'default',
     options: {
-      port,
-      database,
-      encrypt: true,
-      // Required for <11.0.8
-      trustServerCertificate: true,
-      rowCollectionOnRequestCompletion: true,
-      rowCollectionOnDone: true,
+      userName: user,
+      password,
     },
-  };
+  },
+  options: {
+    port,
+    database,
+    encrypt: true,
+    // Required for <11.0.8
+    trustServerCertificate: true,
+    rowCollectionOnRequestCompletion: true,
+    rowCollectionOnDone: true,
+  },
+};
 
 const processVersion = process.version;
 const tediousVersion = testUtils.getPackageVersion('tedious');
@@ -85,7 +87,7 @@ const incompatVersions =
 describe('tedious', () => {
   let tedious: any;
   let contextManager: AsyncHooksContextManager;
-  let connection: Connection;
+  let connection: tedious['Connection'];
   const provider = new BasicTracerProvider();
   const shouldTest = process.env.RUN_MSSQL_TESTS; // For CI: assumes local db is already available
   const shouldTestLocally = process.env.RUN_MSSQL_TESTS_LOCAL; // For local: spins up local db via docker
@@ -124,7 +126,7 @@ describe('tedious', () => {
     context.setGlobalContextManager(contextManager);
     instrumentation.setTracerProvider(provider);
     instrumentation.enable();
-    tedious = makeApi(require('tedious'));
+    tedious = makeApi(require('tedious'), tediousVersion);
     connection = await tedious.createConnection(config).catch((err: any) => {
       console.error('with config:', config);
       throw err;