Moved tests, rm driver check, add deflt for ColEnc

Author: ctgbarcalow

lib/msnodesqlv8/connection-pool.js

@@ -8,7 +8,6 @@ const shared = require('../shared')
 const ConnectionError = require('../error/connection-error')
 const { platform } = require('os')
 
-const SUPPORTED_DRIVERS = ['ODBC Driver 17 for SQL Server', 'ODBC Driver 18 for SQL Server', 'SQL Server Native Client 11.0']
 const CONNECTION_DRIVER = ['darwin', 'linux'].includes(platform()) ? 'ODBC Driver 17 for SQL Server' : 'SQL Server Native Client 11.0'
 const CONNECTION_STRING_PORT = 'Driver=#{driver};Server=#{server},#{port};Database=#{database};Uid=#{user};Pwd=#{password};Trusted_Connection=#{trusted};Encrypt=#{encrypt};ColumnEncryption=#{columnEncryption};'
 const CONNECTION_STRING_NAMED_INSTANCE = 'Driver=#{driver};Server=#{server}\\#{instance};Database=#{database};Uid=#{user};Pwd=#{password};Trusted_Connection=#{trusted};Encrypt=#{encrypt};ColumnEncryption=#{columnEncryption};'
@@ -34,19 +33,15 @@ class ConnectionPool extends BaseConnectionPool {
 
         switch (key) {
           case 'driver':
-            // This allows windows users to choose thier driver
-            if (this.config.options.driver && !SUPPORTED_DRIVERS.includes(this.config.options.driver)) {
-              return reject('Unsupported driver: ' + this.config.options.driver)
-            }
-            return (this.config.options.driver ?? CONNECTION_DRIVER)
+            return this.config.options.driver ?? CONNECTION_DRIVER
           case 'instance':
             return this.config.options.instanceName
           case 'trusted':
             return this.config.options.trustedConnection ? 'Yes' : 'No'
           case 'encrypt':
             return this.config.options.encrypt ? 'Yes' : 'No'
           case 'columnEncryption':
-            return this.config.options.columnEncryption
+            return this.config.options.columnEncryption ?? 'Disabled'
           default:
             return this.config[key] != null ? this.config[key] : ''
         }

test/common/tests.js

@@ -1315,17 +1315,6 @@ module.exports = (sql, driver) => {
       })
     },
 
-    'force ODBC driver verify' (cfg) {
-      assert.ok(cfg.conn_str.startsWith('Driver=ODBC Driver 17 for SQL Server'))
-    },
-
-    'force ODBC driver query' (done) {
-      sql.query('select serverproperty(N\'servername\') as servername; ', (err, result) => {
-        assert.ok(result.recordset[0].servername)
-        done(err)
-      })
-    },
-
     'login failed' (done, message) {
       const config = readConfig()
       config.user = '__notexistinguser__'

test/msnodesqlv8/msnodesqlv8.js

@@ -93,6 +93,11 @@ describe('msnodesqlv8', function () {
     it('request timeout', done => TESTS['request timeout'](done))
     it('dataLength type correction', done => TESTS['dataLength type correction'](done))
     it('chunked xml support', done => TESTS['chunked xml support'](done))
+    it('force ODBC connection healthy works', (done) => {
+      const cfg = config()
+      cfg.options.driver = 'ODBC Driver 17 for SQL Server'
+      TESTS['connection healthy works'](cfg, done)
+    })
 
     after(() => sql.close())
   })
@@ -179,19 +184,6 @@ describe('msnodesqlv8', function () {
     })
   })
 
-  describe('msnodesqlv8 force ODBC driver', function () {
-    before(function (done) {
-      const cfg = config()
-      cfg.options.driver = 'ODBC Driver 17 for SQL Server'
-      cfg.beforeConnect = TESTS['force ODBC driver verify']
-      sql.connect(cfg, done)
-    })
-    it('ODBC Driver 17 for SQL Server', done => TESTS['force ODBC driver query'](done))
-    after(function () {
-      sql.close()
-    })
-  })
-
   describe('msnodesqlv8 connection errors', function () {
     it('login failed', done => TESTS['login failed'](done, /Login failed for user '(.*)'\./))
     it.skip('timeout (not supported by msnodesqlv8)', done => TESTS.timeout.call(this, done, /1000ms/))