mssql 7.2.0 → 8.0.1

package/lib/cli.js

@@ -1,113 +1,113 @@
-'use strict'
-
-const fs = require('fs')
-const path = require('path')
-const sql = require('./tedious')
-
-const exit = process.exit
-const write = text => process.stdout.write(text)
-Buffer.prototype.toJSON = () => {
-  return `0x${this.toString('hex')}`
-}
-
-// Resolve config path
-
-let cfgPath = path.resolve(process.argv[2] || process.cwd())
-if (fs.lstatSync(cfgPath).isDirectory()) {
-  cfgPath = path.resolve(cfgPath, './.mssql.json')
-}
-if (!fs.existsSync(cfgPath)) {
-  console.error('Config file not found.')
-  exit(1)
-}
-
-// Config checks & parse
-
-let config
-try {
-  config = fs.readFileSync(cfgPath)
-} catch (err) {
-  console.error(`Failed to load config file. ${err.message}`)
-  exit(1)
-}
-
-try {
-  config = JSON.parse(config)
-} catch (err) {
-  console.error(`Failed to parse config file. ${err.message}`)
-  exit(1)
-}
-
-// Read stdin
-
-const buffer = []
-
-process.stdin.setEncoding('utf8')
-process.stdin.on('readable', () => buffer.push(process.stdin.read()))
-
-process.stdin.on('end', () => {
-  const statement = buffer.join('')
-  let rst = 0
-  let index = 0
-
-  if (!statement.length) {
-    console.error('Statement is empty.')
-    exit(1)
-  }
-
-  sql.connect(config, err => {
-    if (err) {
-      console.error(err.message)
-      exit(1)
-    }
-
-    write('[')
-
-    const request = new sql.Request()
-    request.stream = true
-    request.on('recordset', () => {
-      index = 0
-      if (rst++ > 0) {
-        write('],')
-      }
-
-      return write('[')
-    })
-
-    request.on('error', err => {
-      console.error(err.message)
-      sql.close()
-      return exit(1)
-    })
-
-    request.on('row', row => {
-      if (index++ > 0) {
-        write(',')
-      }
-
-      return write(JSON.stringify(row))
-    })
-
-    request.on('done', () => {
-      if (rst > 0) {
-        write(']')
-      }
-
-      write(']\n')
-      sql.close()
-      return exit(0)
-    })
-
-    request.query(statement)
-  })
-})
-
-process.on('uncaughtException', err => {
-  if (err.code === 'EPIPE') {
-    console.error('Failed to pipe output stream.')
-  } else {
-    console.error(err.message)
-  }
-
-  exit(1)
-})
+'use strict'
+
+const fs = require('fs')
+const path = require('path')
+const sql = require('./tedious')
+
+const exit = process.exit
+const write = text => process.stdout.write(text)
+Buffer.prototype.toJSON = () => {
+  return `0x${this.toString('hex')}`
+}
+
+// Resolve config path
+
+let cfgPath = path.resolve(process.argv[2] || process.cwd())
+if (fs.lstatSync(cfgPath).isDirectory()) {
+  cfgPath = path.resolve(cfgPath, './.mssql.json')
+}
+if (!fs.existsSync(cfgPath)) {
+  console.error('Config file not found.')
+  exit(1)
+}
+
+// Config checks & parse
+
+let config
+try {
+  config = fs.readFileSync(cfgPath)
+} catch (err) {
+  console.error(`Failed to load config file. ${err.message}`)
+  exit(1)
+}
+
+try {
+  config = JSON.parse(config)
+} catch (err) {
+  console.error(`Failed to parse config file. ${err.message}`)
+  exit(1)
+}
+
+// Read stdin
+
+const buffer = []
+
+process.stdin.setEncoding('utf8')
+process.stdin.on('readable', () => buffer.push(process.stdin.read()))
+
+process.stdin.on('end', () => {
+  const statement = buffer.join('')
+  let rst = 0
+  let index = 0
+
+  if (!statement.length) {
+    console.error('Statement is empty.')
+    exit(1)
+  }
+
+  sql.connect(config, err => {
+    if (err) {
+      console.error(err.message)
+      exit(1)
+    }
+
+    write('[')
+
+    const request = new sql.Request()
+    request.stream = true
+    request.on('recordset', () => {
+      index = 0
+      if (rst++ > 0) {
+        write('],')
+      }
+
+      return write('[')
+    })
+
+    request.on('error', err => {
+      console.error(err.message)
+      sql.close()
+      return exit(1)
+    })
+
+    request.on('row', row => {
+      if (index++ > 0) {
+        write(',')
+      }
+
+      return write(JSON.stringify(row))
+    })
+
+    request.on('done', () => {
+      if (rst > 0) {
+        write(']')
+      }
+
+      write(']\n')
+      sql.close()
+      return exit(0)
+    })
+
+    request.query(statement)
+  })
+})
+
+process.on('uncaughtException', err => {
+  if (err.code === 'EPIPE') {
+    console.error('Failed to pipe output stream.')
+  } else {
+    console.error(err.message)
+  }
+
+  exit(1)
+})

package/lib/isolationlevel.js

@@ -1,9 +1,9 @@
-'use strict'
-
-module.exports = {
-  READ_UNCOMMITTED: 0x01,
-  READ_COMMITTED: 0x02,
-  REPEATABLE_READ: 0x03,
-  SERIALIZABLE: 0x04,
-  SNAPSHOT: 0x05
-}
+'use strict'
+
+module.exports = {
+  READ_UNCOMMITTED: 0x01,
+  READ_COMMITTED: 0x02,
+  REPEATABLE_READ: 0x03,
+  SERIALIZABLE: 0x04,
+  SNAPSHOT: 0x05
+}

package/lib/msnodesqlv8/connection-pool.js

@@ -6,9 +6,11 @@ const BaseConnectionPool = require('../base/connection-pool')
 const { IDS, INCREMENT } = require('../utils')
 const shared = require('../shared')
 const ConnectionError = require('../error/connection-error')
+const { platform } = require('os')
 
-const CONNECTION_STRING_PORT = 'Driver=SQL Server Native Client 11.0;Server=#{server},#{port};Database=#{database};Uid=#{user};Pwd=#{password};Trusted_Connection=#{trusted};Encrypt=#{encrypt};'
-const CONNECTION_STRING_NAMED_INSTANCE = 'Driver=SQL Server Native Client 11.0;Server=#{server}\\#{instance};Database=#{database};Uid=#{user};Pwd=#{password};Trusted_Connection=#{trusted};Encrypt=#{encrypt};'
+const CONNECTION_DRIVER = ['darwin', 'linux'].includes(platform()) ? 'ODBC Driver 17 for SQL Server' : 'SQL Server Native Client 11.0'
+const CONNECTION_STRING_PORT = `Driver=${CONNECTION_DRIVER};Server=#{server},#{port};Database=#{database};Uid=#{user};Pwd=#{password};Trusted_Connection=#{trusted};Encrypt=#{encrypt};`
+const CONNECTION_STRING_NAMED_INSTANCE = `Driver=${CONNECTION_DRIVER};Server=#{server}\\#{instance};Database=#{database};Uid=#{user};Pwd=#{password};Trusted_Connection=#{trusted};Encrypt=#{encrypt};`
 
 class ConnectionPool extends BaseConnectionPool {
   _poolCreate () {

package/lib/msnodesqlv8/index.js

@@ -22,6 +22,13 @@ Object.defineProperty(module.exports, 'Promise', {
   }
 })
 
+Object.defineProperty(module.exports, 'valueHandler', {
+  enumerable: true,
+  value: base.valueHandler,
+  writable: false,
+  configurable: false
+})
+
 base.driver.name = 'msnodesqlv8'
 base.driver.ConnectionPool = ConnectionPool
 base.driver.Transaction = Transaction

package/lib/msnodesqlv8/request.js

@@ -8,6 +8,7 @@ const { IDS, objectHasProperty } = require('../utils')
 const { TYPES, DECLARATIONS, declare } = require('../datatypes')
 const { PARSERS: UDT } = require('../udt')
 const Table = require('../table')
+const { valueHandler } = require('../shared')
 
 const JSON_COLUMN_ID = 'JSON_F52E2B61-18A1-11d1-B105-00805F49916B'
 const XML_COLUMN_ID = 'XML_F52E2B61-18A1-11d1-B105-00805F49916B'
@@ -122,7 +123,12 @@ const createColumns = function (metadata, arrayRowMode) {
 }
 
 const valueCorrection = function (value, metadata) {
-  if ((metadata.sqlType === 'time') && (value != null)) {
+  const type = metadata && objectHasProperty(metadata, 'sqlType') && objectHasProperty(DECLARATIONS, metadata.sqlType)
+    ? DECLARATIONS[metadata.sqlType]
+    : null
+  if (type && valueHandler.has(type)) {
+    return valueHandler.get(type)(value)
+  } else if ((metadata.sqlType === 'time') && (value != null)) {
     value.setFullYear(1970)
     return value
   } else if ((metadata.sqlType === 'udt') && (value != null)) {
@@ -146,7 +152,11 @@ class Request extends BaseRequest {
     super._bulk(table, options, err => {
       if (err) return callback(err)
 
-      table._makeBulk()
+      try {
+        table._makeBulk()
+      } catch (e) {
+        return callback(new RequestError(e, 'EREQUEST'))
+      }
 
       if (!table.name) {
         setImmediate(callback, new RequestError('Table name must be specified for bulk insert.', 'ENAME'))

package/lib/shared.js

@@ -105,3 +105,10 @@ Object.defineProperty(module.exports, 'Promise', {
     PromiseLibrary = value
   }
 })
+
+Object.defineProperty(module.exports, 'valueHandler', {
+  enumerable: true,
+  value: new Map(),
+  writable: false,
+  configurable: false
+})

package/lib/table.js

@@ -48,6 +48,13 @@ function Table (name) {
     }
   }
   )
+
+  Object.defineProperty(this.rows, 'clear', {
+    value () {
+      return this.splice(0, this.length)
+    }
+  }
+  )
 }
 
 /*

package/lib/tedious/connection-pool.js

@@ -34,24 +34,23 @@ class ConnectionPool extends BaseConnectionPool {
         }, this.config.authentication)
       }
 
-      cfg.options.database = this.config.database
-      cfg.options.port = this.config.port
-      cfg.options.connectTimeout = this.config.connectionTimeout || this.config.timeout || 15000
-      cfg.options.requestTimeout = this.config.requestTimeout != null ? this.config.requestTimeout : 15000
+      cfg.options.database = cfg.options.database || this.config.database
+      cfg.options.port = cfg.options.port || this.config.port
+      cfg.options.connectTimeout = cfg.options.connectTimeout || this.config.connectionTimeout || this.config.timeout || 15000
+      cfg.options.requestTimeout = cfg.options.requestTimeout || this.config.requestTimeout != null ? this.config.requestTimeout : 15000
       cfg.options.tdsVersion = cfg.options.tdsVersion || '7_4'
-      cfg.options.rowCollectionOnDone = false
-      cfg.options.rowCollectionOnRequestCompletion = false
-      cfg.options.useColumnNames = false
+      cfg.options.rowCollectionOnDone = cfg.options.rowCollectionOnDone || false
+      cfg.options.rowCollectionOnRequestCompletion = cfg.options.rowCollectionOnRequestCompletion || false
+      cfg.options.useColumnNames = cfg.options.useColumnNames || false
       cfg.options.appName = cfg.options.appName || 'node-mssql'
 
       // tedious always connect via tcp when port is specified
       if (cfg.options.instanceName) delete cfg.options.port
 
       if (isNaN(cfg.options.requestTimeout)) cfg.options.requestTimeout = 15000
-      if (cfg.options.requestTimeout === Infinity) cfg.options.requestTimeout = 0
-      if (cfg.options.requestTimeout < 0) cfg.options.requestTimeout = 0
+      if (cfg.options.requestTimeout === Infinity || cfg.options.requestTimeout < 0) cfg.options.requestTimeout = 0
 
-      if (this.config.debug) {
+      if (!cfg.options.debug && this.config.debug) {
         cfg.options.debug = {
           packet: true,
           token: true,
@@ -73,6 +72,7 @@ class ConnectionPool extends BaseConnectionPool {
         }
 
         debug('connection(%d): established', IDS.get(tedious))
+        this.collation = tedious.databaseCollation
         resolveOnce(tedious)
       })
       IDS.add(tedious, 'Connection')

package/lib/tedious/index.js

@@ -22,6 +22,13 @@ Object.defineProperty(module.exports, 'Promise', {
   }
 })
 
+Object.defineProperty(module.exports, 'valueHandler', {
+  enumerable: true,
+  value: base.valueHandler,
+  writable: false,
+  configurable: false
+})
+
 base.driver.name = 'tedious'
 base.driver.ConnectionPool = ConnectionPool
 base.driver.Transaction = Transaction

package/lib/tedious/request.js

@@ -8,6 +8,7 @@ const { IDS, objectHasProperty } = require('../utils')
 const { TYPES, DECLARATIONS, declare, cast } = require('../datatypes')
 const Table = require('../table')
 const { PARSERS: UDT } = require('../udt')
+const { valueHandler } = require('../shared')
 
 const JSON_COLUMN_ID = 'JSON_F52E2B61-18A1-11d1-B105-00805F49916B'
 const XML_COLUMN_ID = 'XML_F52E2B61-18A1-11d1-B105-00805F49916B'
@@ -159,7 +160,10 @@ const createColumns = function (metadata, arrayRowMode) {
 }
 
 const valueCorrection = function (value, metadata) {
-  if ((metadata.type === tds.TYPES.UDT) && (value != null)) {
+  const type = getMssqlType(metadata.type)
+  if (valueHandler.has(type)) {
+    return valueHandler.get(type)(value)
+  } else if ((metadata.type === tds.TYPES.UDT) && (value != null)) {
     if (UDT[metadata.udtInfo.typeName]) {
       return UDT[metadata.udtInfo.typeName](value)
     } else {
@@ -213,7 +217,11 @@ class Request extends BaseRequest {
     super._bulk(table, options, err => {
       if (err) return callback(err)
 
-      table._makeBulk()
+      try {
+        table._makeBulk()
+      } catch (e) {
+        return callback(new RequestError(e, 'EREQUEST'))
+      }
 
       if (!table.name) {
         return callback(new RequestError('Table name must be specified for bulk insert.', 'ENAME'))
@@ -330,26 +338,18 @@ class Request extends BaseRequest {
           bulk.addColumn(col.name, getTediousType(col.type), { nullable: col.nullable, length: col.length, scale: col.scale, precision: col.precision })
         }
 
-        for (const row of table.rows) {
-          try {
-            bulk.addRow(row)
-          } catch (e) {
-            return handleError(true, connection, e)
-          }
-        }
-
         if (table.create) {
           const objectid = table.temporary ? `tempdb..[${table.name}]` : table.path
           const req = new tds.Request(`if object_id('${objectid.replace(/'/g, '\'\'')}') is null ${table.declare()}`, err => {
             if (err) return done(err)
 
-            connection.execBulkLoad(bulk)
+            connection.execBulkLoad(bulk, table.rows)
           })
           this._setCurrentRequest(req)
 
           connection.execSqlBatch(req)
         } else {
-          connection.execBulkLoad(bulk)
+          connection.execBulkLoad(bulk, table.rows)
         }
       })
     })
@@ -604,7 +604,7 @@ class Request extends BaseRequest {
               row.push(col.value)
             } else {
               const exi = row[col.metadata.colName]
-              if (exi != null) {
+              if (exi !== undefined) {
                 if (exi instanceof Array) {
                   exi.push(col.value)
                 } else {
@@ -641,7 +641,7 @@ class Request extends BaseRequest {
               const param = this.parameters[name]
 
               try {
-                param.value = getTediousType(param.type).validate(param.value)
+                param.value = getTediousType(param.type).validate(param.value, this.parent.collation)
               } catch (e) {
                 e.message = `Validation failed for parameter '${name}'. ${e.message}`
                 const err = new RequestError(e, 'EPARAM')

package/package.json

@@ -21,20 +21,20 @@
     "azure",
     "node-mssql"
   ],
-  "version": "7.2.0",
+  "version": "8.0.1",
   "main": "index.js",
   "repository": "github:tediousjs/node-mssql",
   "license": "MIT",
   "dependencies": {
     "@tediousjs/connection-string": "^0.3.0",
-    "debug": "^4",
+    "debug": "^4.3.3",
     "rfdc": "^1.3.0",
-    "tarn": "^3.0.1",
-    "tedious": "^11.0.7"
+    "tarn": "^3.0.2",
+    "tedious": "^14.0.0"
   },
   "devDependencies": {
-    "mocha": "^8.3.2",
-    "standard": "^16.0.3"
+    "mocha": "^9.1.3",
+    "standard": "^16.0.4"
   },
   "engines": {
     "node": ">=10"

package/test.js

@@ -1,51 +1,40 @@
-'use strict'
-
-const mssql = require('./')
-
-const sqlConfig = {
-  password: 'Upper_l0wercase',
-  database: 'di_production',
-  stream: false,
-  authentication: {
-    type: 'test',
-  },
-  options: {
-    trustServerCertificate: true,
-    enableArithAbort: true,
-    encrypt: true,
-    abortTransactionOnError: false,
-  },
-  pool: {
-    max: 1,
-    min: 0,
-  },
-  port: 1433,
-  user: 'sa',
-  server: 'localhost',
-}
-
-async function main () {
-  const pool = new mssql.ConnectionPool(sqlConfig)
-  await pool.connect()
-
-  const table = new mssql.Table('Sandbox.dbo.BulkTest')
-  table.create = true
-  table.columns.add('ABigInt', mssql.BigInt);
-  table.rows.add(1.2)
-
-  const transaction = new mssql.Transaction(pool);
-  await transaction.begin();
-
-  try {
-    const request = new mssql.Request(transaction)
-    await request.bulk(table)
-    await transaction.commit();
-  } catch (error) {
-    console.error(error)
-    await transaction.rollback();
-  } finally {
-    await pool.close();
-  }
-}
-
-main().catch(console.error);
+'use strict'
+const mssql = require('./')
+
+const [, , max] = process.argv
+
+const sqlConfig = {
+  password: 'P@ssw0rd',
+  database: 'test',
+  stream: false,
+  // driver: 'msnodesqlv8',
+  options: {
+    trustServerCertificate: true,
+    enableArithAbort: true,
+    encrypt: true,
+    abortTransactionOnError: false
+  },
+  pool: {
+    max: max ? parseInt(max) : 10,
+    min: 0
+  },
+  port: 1433,
+  user: 'sa',
+  server: 'localhost',
+  arrayRowMode: true
+}
+
+mssql.connect(sqlConfig).then((pool) => {
+  console.log('Connected to SQL server')
+  const request = pool.request()
+  request.stream = true
+  request.on('error', (err) => {
+    console.error('good', err)
+  })
+  return request.query('SELECT * FROM nontable')
+}).catch((err) => {
+  console.error('bad', err)
+}).then(() => {
+  console.log('Disconnecting from SQL server')
+  return mssql.close()
+}).then(() => console.log('Disconnected'))