mssql 6.3.2 → 6.4.0

package/CHANGELOG.txt

@@ -1,3 +1,8 @@
+v6.4.0 (2021-11-18)
+-------------------
+[new] Transaction/PreparedStatements expose the config from their parent connection
+[fix] Fix inherited request configs from the pool. Specifically stream and arrayRowMode now inherit accurately from the connection config ([#1338](https://github.com/tediousjs/node-mssql/pull/1338))
+
 v6.3.2 (2021-05-13)
 -------------------
 [fix] Bump various dependencies for security fixes

package/LICENSE.md

@@ -1,22 +1,22 @@
-MIT License
-
-Copyright (c) 2013-2018 Patrik Simek and contributors
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
+MIT License
+
+Copyright (c) 2013-2018 Patrik Simek and contributors
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+

package/lib/base/prepared-statement.js

@@ -35,6 +35,10 @@ class PreparedStatement extends EventEmitter {
     this.parameters = {}
   }
 
+  get config () {
+    return this.parent.config
+  }
+
   get connected () {
     return this.parent.connected
   }

package/lib/base/request.js

@@ -25,7 +25,7 @@ class Request extends EventEmitter {
   /**
    * Create new Request.
    *
-   * @param {Connection|ConnectionPool|Transaction|PreparedStatement} parent If ommited, global connection is used instead.
+   * @param {Connection|ConnectionPool|Transaction|PreparedStatement} parent If omitted, global connection is used instead.
    */
 
   constructor (parent) {
@@ -38,6 +38,8 @@ class Request extends EventEmitter {
     this._paused = false
     this.parent = parent || globalConnection.pool
     this.parameters = {}
+    this.stream = null
+    this.arrayRowMode = null
   }
 
   get paused () {
@@ -223,8 +225,8 @@ class Request extends EventEmitter {
    */
 
   batch (batch, callback) {
-    if (this.stream == null && this.connection) this.stream = this.connection.config.stream
-    if (this.arrayRowMode == null && this.connection) this.arrayRowMode = this.connection.config.arrayRowMode
+    if (this.stream === null && this.parent) this.stream = this.parent.config.stream
+    if (this.arrayRowMode === null && this.parent) this.arrayRowMode = this.parent.config.arrayRowMode
     this.rowsAffected = 0
 
     if (typeof callback === 'function') {
@@ -287,11 +289,11 @@ class Request extends EventEmitter {
    */
 
   _batch (batch, callback) {
-    if (!this.connection) {
+    if (!this.parent) {
       return setImmediate(callback, new RequestError('No connection is specified for that request.', 'ENOCONN'))
     }
 
-    if (!this.connection.connected) {
+    if (!this.parent.connected) {
       return setImmediate(callback, new ConnectionError('Connection is closed.', 'ECONNCLOSED'))
     }
 
@@ -316,8 +318,8 @@ class Request extends EventEmitter {
       options = {}
     }
 
-    if (this.stream == null && this.connection) this.stream = this.connection.config.stream
-    if (this.arrayRowMode == null && this.connection) this.arrayRowMode = this.connection.config.arrayRowMode
+    if (this.stream === null && this.parent) this.stream = this.parent.config.stream
+    if (this.arrayRowMode === null && this.parent) this.arrayRowMode = this.parent.config.arrayRowMode
 
     if (this.stream || typeof callback === 'function') {
       this._bulk(table, options, (err, rowsAffected) => {
@@ -393,8 +395,8 @@ class Request extends EventEmitter {
    */
 
   query (command, callback) {
-    if (this.stream == null && this.connection) this.stream = this.connection.config.stream
-    if (this.arrayRowMode == null && this.connection) this.arrayRowMode = this.connection.config.arrayRowMode
+    if (this.stream === null && this.parent) this.stream = this.parent.config.stream
+    if (this.arrayRowMode === null && this.parent) this.arrayRowMode = this.parent.config.arrayRowMode
     this.rowsAffected = 0
 
     if (typeof callback === 'function') {
@@ -482,8 +484,8 @@ class Request extends EventEmitter {
    */
 
   execute (command, callback) {
-    if (this.stream == null && this.connection) this.stream = this.connection.config.stream
-    if (this.arrayRowMode == null && this.connection) this.arrayRowMode = this.connection.config.arrayRowMode
+    if (this.stream === null && this.parent) this.stream = this.parent.config.stream
+    if (this.arrayRowMode === null && this.parent) this.arrayRowMode = this.parent.config.arrayRowMode
     this.rowsAffected = 0
 
     if (typeof callback === 'function') {

package/lib/base/transaction.js

@@ -37,6 +37,10 @@ class Transaction extends EventEmitter {
     this.name = ''
   }
 
+  get config () {
+    return this.parent.config
+  }
+
   get connected () {
     return this.parent.connected
   }

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/package.json

@@ -21,14 +21,14 @@
     "azure",
     "node-mssql"
   ],
-  "version": "6.3.2",
+  "version": "6.4.0",
   "main": "index.js",
   "repository": "github:tediousjs/node-mssql",
   "license": "MIT",
   "dependencies": {
-    "debug": "^4.3.1",
+    "debug": "^4.3.2",
     "tarn": "^1.1.5",
-    "tedious": "^6.7.0"
+    "tedious": "^6.7.1"
   },
   "devDependencies": {
     "mocha": "^6.2.3",

package/test.js

@@ -1,40 +1,40 @@
-'use strict'
-
-const mssql = require('./')
-const wtf = require('wtfnode');
-
-const sqlConfig = {
-  password: '&r8wrucH',
-  database: 'StockDB',
-  stream: false,
-  options: {
-    // trustServerCertificate: true,
-    enableArithAbort: true,
-    encrypt: true,
-    abortTransactionOnError: false,
-  },
-  pool: {
-    max: 1,
-    min: 0,
-  },
-  port: 1433,
-  user: 'dhensby',
-  server: '4sa.database.windows.net',
-}
-
-// Bad URI, connection timeouts, hangs process
-mssql.connect({ ...sqlConfig, port: 2345 }).catch(err => {
-  console.error(err.message);
-  console.log('reconnecting...');
-
-  // Try to connect using the right URI
-  return mssql
-    .connect(sqlConfig)
-    .then(() => console.log('connected'))
-    .then(() => mssql.close())
-    .then(() => console.log('closed'))
-    .catch(err => {
-      console.error(err.message)
-      wtf.dump()
-    });  // <-- Fails here
-});
+'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'))