mssql 3.1.1 → 3.3.0

package/appveyor.yml

@@ -5,6 +5,7 @@ environment:
     - nodejs_version: "0.10"
     - nodejs_version: "0.12"
     - nodejs_version: "4"
+    - nodejs_version: "5"
 
 install:
   - ps: Install-Product node $env:nodejs_version

package/lib/connectionstring.js

@@ -186,7 +186,7 @@
   };
 
   resolveConnectionString = function(string) {
-    var config, parsed, ref, ref1, ref10, ref11, ref12, ref13, ref14, ref2, ref3, ref4, ref5, ref6, ref7, ref8, ref9, server, user;
+    var config, parsed, ref, ref1, ref10, ref11, ref12, ref13, ref14, ref15, ref16, ref17, ref2, ref3, ref4, ref5, ref6, ref7, ref8, ref9, server, user;
     if (/^(mssql|tedious|msnodesql|tds)\:\/\//i.test(string)) {
       parsed = parseConnectionURI(string);
     } else {
@@ -211,13 +211,22 @@
       driver: parsed.driver,
       password: (ref6 = parsed.pwd) != null ? ref6 : parsed.password,
       database: (ref7 = parsed.database) != null ? ref7 : parsed['initial catalog'],
-      connectionTimeout: (ref8 = (ref9 = parsed.timeout) != null ? ref9 : parsed['connect timeout']) != null ? ref8 : parsed['connection timeout'],
-      requestTimeout: parsed['request timeout'],
-      stream: (ref10 = (ref11 = parsed.stream) != null ? ref11.toLowerCase() : void 0) === 'true' || ref10 === 'yes' || ref10 === '1',
+      connectionTimeout: (ref8 = (ref9 = (ref10 = parsed.connectionTimeout) != null ? ref10 : parsed.timeout) != null ? ref9 : parsed['connect timeout']) != null ? ref8 : parsed['connection timeout'],
+      requestTimeout: (ref11 = parsed.requestTimeout) != null ? ref11 : parsed['request timeout'],
+      stream: (ref12 = (ref13 = parsed.stream) != null ? ref13.toLowerCase() : void 0) === 'true' || ref12 === 'yes' || ref12 === '1',
       options: {
-        encrypt: (ref12 = (ref13 = parsed.encrypt) != null ? ref13.toLowerCase() : void 0) === 'true' || ref12 === 'yes' || ref12 === '1'
+        encrypt: (ref14 = (ref15 = parsed.encrypt) != null ? ref15.toLowerCase() : void 0) === 'true' || ref14 === 'yes' || ref14 === '1'
       }
     };
+    if (parsed.useUTC != null) {
+      config.options.useUTC = (ref16 = parsed.useUTC.toLowerCase()) === 'true' || ref16 === 'yes' || ref16 === '1';
+    }
+    if (config.connectionTimeout != null) {
+      config.connectionTimeout = parseInt(config.connectionTimeout);
+    }
+    if (config.requestTimeout != null) {
+      config.requestTimeout = parseInt(config.requestTimeout);
+    }
     if (/^(.*)\\(.*)$/.exec(user)) {
       config.domain = RegExp.$1;
       user = RegExp.$2;
@@ -238,7 +247,7 @@
         server = RegExp.$1.trim();
         config.port = parseInt(RegExp.$2.trim());
       }
-      if ((ref14 = server.toLowerCase()) === '.' || ref14 === '(.)' || ref14 === '(localdb)' || ref14 === '(local)') {
+      if ((ref17 = server.toLowerCase()) === '.' || ref17 === '(.)' || ref17 === '(localdb)' || ref17 === '(local)') {
         server = 'localhost';
       }
     }

package/lib/main.js

@@ -4,6 +4,7 @@
     extend = function(child, parent) { for (var key in parent) { if (hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; },
     hasProp = {}.hasOwnProperty,
     indexOf = [].indexOf || function(item) { for (var i = 0, l = this.length; i < l; i++) { if (i in this && this[i] === item) return i; } return -1; },
+    slice = [].slice,
     bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; };
 
   EventEmitter = require('events').EventEmitter;
@@ -383,6 +384,36 @@
       return new Transaction(this);
     };
 
+
+    /*
+    	Creates a new query using this connection from a tagged template string.
+    	
+    	@param {Array} strings Array of string literals.
+    	@param {...*} keys Values.
+    	@returns {Request}
+     */
+
+    Connection.prototype.query = function() {
+      var strings, values;
+      strings = arguments[0], values = 2 <= arguments.length ? slice.call(arguments, 1) : [];
+      return new Request(this)._template('query', strings, values);
+    };
+
+
+    /*
+    	Creates a new batch using this connection from a tagged template string.
+    	
+    	@param {Array} strings Array of string literals.
+    	@param {...*} keys Values.
+    	@returns {Request}
+     */
+
+    Connection.prototype.batch = function() {
+      var strings, values;
+      strings = arguments[0], values = 2 <= arguments.length ? slice.call(arguments, 1) : [];
+      return new Request(this)._template('batch', strings, values);
+    };
+
     return Connection;
 
   })(EventEmitter);
@@ -396,6 +427,7 @@
   @property {Connection} connection Reference to used connection.
   @property {Boolean} multiple If `true`, `execute` will handle multiple recordsets.
   @property {String} statement Prepared SQL statement.
+  @property {Request} lastRequest References instance of most recent Request created by executing a statement.
    */
 
   PreparedStatement = (function(superClass) {
@@ -423,6 +455,8 @@
 
     PreparedStatement.prototype.stream = null;
 
+    PreparedStatement.prototype.lastRequest = null;
+
 
     /*
     	Create new Prepared Statement.
@@ -678,7 +712,7 @@
 
     PreparedStatement.prototype._execute = function(values, callback) {
       var name, param, ref1, req;
-      req = new Request(this);
+      req = this.lastRequest = new Request(this);
       if (this.stream != null) {
         req.stream = this.stream;
       }
@@ -1119,6 +1153,22 @@
     };
 
 
+    /*
+    	Fetch request from tagged template string.
+     */
+
+    Request.prototype._template = function(method, strings, values) {
+      var command, i, index, len, value;
+      command = [strings[0]];
+      for (index = i = 0, len = values.length; i < len; index = ++i) {
+        value = values[index];
+        this.input("param" + (index + 1), value);
+        command.push("@param" + (index + 1), strings[index + 1]);
+      }
+      return this[method](command.join(''));
+    };
+
+
     /*
     	Acquire connection for this request from connection.
      */
@@ -1810,10 +1860,49 @@
     return global_connection != null ? global_connection.close(callback) : void 0;
   };
 
+
+  /*
+  Attach evnet handler to global connection.
+  
+  @param {String} event Event name.
+  @param {Function} handler Event handler.
+  @returns {Connection}
+   */
+
   module.exports.on = function(event, handler) {
     return global_connection != null ? global_connection.on(event, handler) : void 0;
   };
 
+
+  /*
+  Creates a new query using global connection from a tagged template string.
+  
+  @param {Array} strings Array of string literals.
+  @param {...*} keys Values.
+  @returns {Request}
+   */
+
+  module.exports.query = function() {
+    var strings, values;
+    strings = arguments[0], values = 2 <= arguments.length ? slice.call(arguments, 1) : [];
+    return new Request()._template('query', strings, values);
+  };
+
+
+  /*
+  Creates a new batch using global connection from a tagged template string.
+  
+  @param {Array} strings Array of string literals.
+  @param {...*} keys Values.
+  @returns {Request}
+   */
+
+  module.exports.batch = function() {
+    var strings, values;
+    strings = arguments[0], values = 2 <= arguments.length ? slice.call(arguments, 1) : [];
+    return new Request()._template('batch', strings, values);
+  };
+
   module.exports.Connection = Connection;
 
   module.exports.Transaction = Transaction;

package/lib/msnodesql.js

@@ -429,10 +429,28 @@
                 _this._log("---------- response -----------");
               }
               req.on('meta', function(metadata) {
-                var ref1;
+                var error, ex, ref1;
                 if (row) {
                   if (isChunkedRecordset) {
-                    row[columns[0].name] = chunksBuffer.join('');
+                    if (columns[0].name === JSON_COLUMN_ID && _this.connection.config.parseJSON === true) {
+                      try {
+                        row = JSON.parse(chunksBuffer.join(''));
+                        if (!_this.stream) {
+                          recordsets[recordsets.length - 1][0] = row;
+                        }
+                      } catch (error) {
+                        ex = error;
+                        row = null;
+                        ex = RequestError(new Error("Failed to parse incoming JSON. " + ex.message), 'EJSON');
+                        if (_this.stream) {
+                          _this.emit('error', ex);
+                        } else {
+                          console.error(ex);
+                        }
+                      }
+                    } else {
+                      row[columns[0].name] = chunksBuffer.join('');
+                    }
                     chunksBuffer = null;
                   }
                   if (_this.verbose) {
@@ -528,11 +546,29 @@
                 return typeof callback === "function" ? callback(e) : void 0;
               });
               return req.once('done', function() {
-                var elapsed, last, ref1, ref2;
+                var elapsed, error, ex, last, ref1, ref2;
                 if (!_this.nested) {
                   if (row) {
                     if (isChunkedRecordset) {
-                      row[columns[0].name] = chunksBuffer.join('');
+                      if (columns[0].name === JSON_COLUMN_ID && _this.connection.config.parseJSON === true) {
+                        try {
+                          row = JSON.parse(chunksBuffer.join(''));
+                          if (!_this.stream) {
+                            recordsets[recordsets.length - 1][0] = row;
+                          }
+                        } catch (error) {
+                          ex = error;
+                          row = null;
+                          ex = RequestError(new Error("Failed to parse incoming JSON. " + ex.message), 'EJSON');
+                          if (_this.stream) {
+                            _this.emit('error', ex);
+                          } else {
+                            console.error(ex);
+                          }
+                        }
+                      } else {
+                        row[columns[0].name] = chunksBuffer.join('');
+                      }
                       chunksBuffer = null;
                     }
                     if (_this.verbose) {

package/lib/msnodesqlv8.js

@@ -519,10 +519,28 @@
                 _this._log("---------- response -----------");
               }
               req.on('meta', function(metadata) {
-                var ref1;
+                var error, ex, ref1;
                 if (row) {
                   if (isChunkedRecordset) {
-                    row[columns[0].name] = chunksBuffer.join('');
+                    if (columns[0].name === JSON_COLUMN_ID && _this.connection.config.parseJSON === true) {
+                      try {
+                        row = JSON.parse(chunksBuffer.join(''));
+                        if (!_this.stream) {
+                          recordsets[recordsets.length - 1][0] = row;
+                        }
+                      } catch (error) {
+                        ex = error;
+                        row = null;
+                        ex = RequestError(new Error("Failed to parse incoming JSON. " + ex.message), 'EJSON');
+                        if (_this.stream) {
+                          _this.emit('error', ex);
+                        } else {
+                          console.error(ex);
+                        }
+                      }
+                    } else {
+                      row[columns[0].name] = chunksBuffer.join('');
+                    }
                     chunksBuffer = null;
                   }
                   if (_this.verbose) {
@@ -618,11 +636,29 @@
                 return typeof callback === "function" ? callback(e) : void 0;
               });
               return req.once('done', function() {
-                var elapsed, last, ref1, ref2;
+                var elapsed, error, ex, last, ref1, ref2;
                 if (!_this.nested) {
                   if (row) {
                     if (isChunkedRecordset) {
-                      row[columns[0].name] = chunksBuffer.join('');
+                      if (columns[0].name === JSON_COLUMN_ID && _this.connection.config.parseJSON === true) {
+                        try {
+                          row = JSON.parse(chunksBuffer.join(''));
+                          if (!_this.stream) {
+                            recordsets[recordsets.length - 1][0] = row;
+                          }
+                        } catch (error) {
+                          ex = error;
+                          row = null;
+                          ex = RequestError(new Error("Failed to parse incoming JSON. " + ex.message), 'EJSON');
+                          if (_this.stream) {
+                            _this.emit('error', ex);
+                          } else {
+                            console.error(ex);
+                          }
+                        }
+                      } else {
+                        row[columns[0].name] = chunksBuffer.join('');
+                      }
                       chunksBuffer = null;
                     }
                     if (_this.verbose) {

package/lib/tds.js

@@ -551,6 +551,17 @@
                   return typeof callback === "function" ? callback(error, _this.multiple || _this.nested ? recordsets : recordsets[0]) : void 0;
                 }
               });
+              req.on('message', function(msg) {
+                return _this.emit('info', {
+                  message: msg.text,
+                  number: msg.number,
+                  state: msg.state,
+                  "class": msg.severity,
+                  lineNumber: msg.lineNumber,
+                  serverName: msg.serverName,
+                  procName: msg.procName
+                });
+              });
               req.on('error', function(err) {
                 var e;
                 e = RequestError(err, 'EREQUEST');

package/lib/tedious.js

@@ -461,9 +461,15 @@
       }
 
       TediousTransaction.prototype._abort = function() {
+        var pc;
         if (!this._rollbackRequested) {
+          pc = this._pooledConnection;
+          setImmediate((function(_this) {
+            return function() {
+              return _this.connection.pool.release(pc);
+            };
+          })(this));
           this._pooledConnection.removeListener('rollbackTransaction', this._abort);
-          this.connection.pool.release(this._pooledConnection);
           this._pooledConnection = null;
           this._aborted = true;
           return this.emit('rollback', true);
@@ -545,7 +551,7 @@
        */
 
       TediousRequest.prototype.bulk = function(table, callback) {
-        var errorHandlers, errors, handleError, hasReturned, started;
+        var errorHandlers, errors, handleError, handleInfo, hasReturned, started;
         table._makeBulk();
         if (!table.name) {
           process.nextTick(function() {
@@ -587,6 +593,19 @@
             return errors.push(e);
           };
         })(this);
+        handleInfo = (function(_this) {
+          return function(msg) {
+            return _this.emit('info', {
+              message: msg.message,
+              number: msg.number,
+              state: msg.state,
+              "class": msg["class"],
+              lineNumber: msg.lineNumber,
+              serverName: msg.serverName,
+              procName: msg.procName
+            });
+          };
+        })(this);
         return this._acquire((function(_this) {
           return function(err, connection) {
             var bulk, col, done, i, j, len, len1, objectid, ref1, ref2, req, row;
@@ -607,8 +626,10 @@
                 }
                 return connection.cancel();
               };
+              errorHandlers['infoMessage'] = handleInfo;
               errorHandlers['errorMessage'] = handleError.bind(void 0, false, connection);
               errorHandlers['error'] = handleError.bind(void 0, true, connection);
+              connection.on('infoMessage', errorHandlers['infoMessage']);
               connection.on('errorMessage', errorHandlers['errorMessage']);
               connection.on('error', errorHandlers['error']);
               done = bindDomain(function(err, rowCount) {
@@ -696,7 +717,7 @@
        */
 
       TediousRequest.prototype.query = function(command, callback) {
-        var batchHasOutput, batchLastRow, chunksBuffer, columns, errorHandlers, errors, handleError, hasReturned, isChunkedRecordset, isJSONRecordset, recordset, recordsets, started, xmlBuffer;
+        var batchHasOutput, batchLastRow, chunksBuffer, columns, errorHandlers, errors, handleError, handleInfo, hasReturned, isChunkedRecordset, isJSONRecordset, recordset, recordsets, started, xmlBuffer;
         columns = {};
         recordset = [];
         recordsets = [];
@@ -736,6 +757,19 @@
             return errors.push(e);
           };
         })(this);
+        handleInfo = (function(_this) {
+          return function(msg) {
+            return _this.emit('info', {
+              message: msg.message,
+              number: msg.number,
+              state: msg.state,
+              "class": msg["class"],
+              lineNumber: msg.lineNumber,
+              serverName: msg.serverName,
+              procName: msg.procName
+            });
+          };
+        })(this);
         return this._acquire((function(_this) {
           return function(err, connection) {
             var assigns, declarations, doneHandler, name, param, ref1, ref2, req, selects, value;
@@ -756,8 +790,10 @@
                 }
                 return connection.cancel();
               };
+              errorHandlers['infoMessage'] = handleInfo;
               errorHandlers['errorMessage'] = handleError.bind(void 0, false, connection);
               errorHandlers['error'] = handleError.bind(void 0, true, connection);
+              connection.on('infoMessage', errorHandlers['infoMessage']);
               connection.on('errorMessage', errorHandlers['errorMessage']);
               connection.on('error', errorHandlers['error']);
               req = new tds.Request(command, bindDomain(function(err) {

package/package.json

@@ -4,11 +4,12 @@
 		"url": "https://patriksimek.cz"
 	},
 	"name": "mssql",
-	"description": "An easy-to-use MSSQL database connector for Node.js.",
+	"description": "Microsoft SQL Server client for Node.js.",
 	"keywords": [
 		"database",
 		"mssql",
 		"sql",
+		"server",
 		"msnodesql",
 		"sqlserver",
 		"tds",
@@ -20,7 +21,7 @@
 		"azure",
 		"node-mssql"
 	],
-	"version": "3.1.1",
+	"version": "3.3.0",
 	"main": "index.js",
 	"repository": {
 		"type": "git",
@@ -28,7 +29,7 @@
 	},
 	"license": "MIT",
 	"dependencies": {
-		"tedious": "~1.13.1",
+		"tedious": "~1.14.0",
 		"generic-pool": "^2.2.0",
 		"promise": "^7.0.1"
 	},
@@ -45,6 +46,7 @@
 		"test": "node_modules/.bin/mocha test/unit",
 		"test-tedious": "node_modules/.bin/mocha test/integration -g tedious",
 		"test-msnodesql": "node_modules/.bin/mocha test/integration -g msnodesql",
+		"test-msnodesqlv8": "node_modules/.bin/mocha test/integration -g msnodesqlv8",
 		"test-tds": "node_modules/.bin/mocha test/integration -g tds",
 		"test-cli": "node_modules/.bin/mocha test/integration -g cli"
 	},

package/src/connectionstring.coffee

@@ -159,7 +159,7 @@ resolveConnectionString = (string) ->
 		parsed = parseConnectionURI string
 	else
 		parsed = parseConnectionString string
-	
+
 	if parsed.driver is 'msnodesql'
 		parsed.driver = 'SQL Server Native Client 11.0'
 		parsed.__original__?.driver = name: 'Driver', escape: ['{', '}']
@@ -172,11 +172,15 @@ resolveConnectionString = (string) ->
 		driver: parsed.driver
 		password: parsed.pwd ? parsed.password
 		database: parsed.database ? parsed['initial catalog']
-		connectionTimeout: parsed.timeout ? parsed['connect timeout'] ? parsed['connection timeout']
-		requestTimeout: parsed['request timeout']
+		connectionTimeout: parsed.connectionTimeout ? parsed.timeout ? parsed['connect timeout'] ? parsed['connection timeout']
+		requestTimeout: parsed.requestTimeout ? parsed['request timeout']
 		stream: parsed.stream?.toLowerCase() in ['true', 'yes', '1']
 		options:
 			encrypt: parsed.encrypt?.toLowerCase() in ['true', 'yes', '1']
+
+	if parsed.useUTC? then config.options.useUTC = parsed.useUTC.toLowerCase() in ['true', 'yes', '1']
+	if config.connectionTimeout? then config.connectionTimeout = parseInt config.connectionTimeout
+	if config.requestTimeout? then config.requestTimeout = parseInt config.requestTimeout
 	
 	if (/^(.*)\\(.*)$/).exec user
 		config.domain = RegExp.$1

package/src/main.coffee

@@ -293,6 +293,28 @@ class Connection extends EventEmitter
 	
 	transaction: ->
 		new Transaction @
+	
+	###
+	Creates a new query using this connection from a tagged template string.
+	
+	@param {Array} strings Array of string literals.
+	@param {...*} keys Values.
+	@returns {Request}
+	###
+	
+	query: (strings, values...) ->
+		new Request(@)._template 'query', strings, values
+	
+	###
+	Creates a new batch using this connection from a tagged template string.
+	
+	@param {Array} strings Array of string literals.
+	@param {...*} keys Values.
+	@returns {Request}
+	###
+	
+	batch: (strings, values...) ->
+		new Request(@)._template 'batch', strings, values
 
 ###
 Class PreparedStatement.
@@ -302,6 +324,7 @@ IMPORTANT: Rememeber that each prepared statement means one reserved connection
 @property {Connection} connection Reference to used connection.
 @property {Boolean} multiple If `true`, `execute` will handle multiple recordsets.
 @property {String} statement Prepared SQL statement.
+@property {Request} lastRequest References instance of most recent Request created by executing a statement.
 ###
 
 class PreparedStatement extends EventEmitter
@@ -317,6 +340,7 @@ class PreparedStatement extends EventEmitter
 	parameters: null
 	multiple: false
 	stream: null
+	lastRequest: null
 	
 	###
 	Create new Prepared Statement.
@@ -534,7 +558,7 @@ class PreparedStatement extends EventEmitter
 				resolve recordset
 	
 	_execute: (values, callback) ->
-		req = new Request @
+		req = @lastRequest = new Request @
 		req.stream = @stream if @stream?
 		req.input 'handle', TYPES.Int, @_handle
 		
@@ -866,6 +890,19 @@ class Request extends EventEmitter
 	_log: (out) ->
 		if typeof @logger is "function" then @logger out else console.log out
 	
+	###
+	Fetch request from tagged template string.
+	###
+	
+	_template: (method, strings, values) ->
+		command = [strings[0]]
+
+		for value, index in values
+			@input "param#{index + 1}", value
+			command.push "@param#{index + 1}", strings[index + 1]
+		
+		@[method] command.join ''
+	
 	###
 	Acquire connection for this request from connection.
 	###
@@ -1412,9 +1449,39 @@ Close global connection.
 module.exports.close = (callback) ->
 	global_connection?.close callback
 
+###
+Attach evnet handler to global connection.
+
+@param {String} event Event name.
+@param {Function} handler Event handler.
+@returns {Connection}
+###
+
 module.exports.on = (event, handler) ->
 	global_connection?.on event, handler
 
+###
+Creates a new query using global connection from a tagged template string.
+
+@param {Array} strings Array of string literals.
+@param {...*} keys Values.
+@returns {Request}
+###
+
+module.exports.query = (strings, values...) ->
+	new Request()._template 'query', strings, values
+
+###
+Creates a new batch using global connection from a tagged template string.
+
+@param {Array} strings Array of string literals.
+@param {...*} keys Values.
+@returns {Request}
+###
+
+module.exports.batch = (strings, values...) ->
+	new Request()._template 'batch', strings, values
+
 module.exports.Connection = Connection
 module.exports.Transaction = Transaction
 module.exports.Request = Request
@@ -1439,7 +1506,7 @@ module.exports.Promise = global.Promise ? require('promise')
 for key, value of TYPES
 	module.exports[key] = value
 	module.exports[key.toUpperCase()] = value
-	
+
 # --- DEPRECATED IN 0.3.0 ------------------------------------------
 
 module.exports.pool =

package/src/msnodesql.coffee

@@ -249,7 +249,23 @@ module.exports = (Connection, Transaction, Request, ConnectionError, Transaction
 					req.on 'meta', (metadata) =>
 						if row
 							if isChunkedRecordset
-								row[columns[0].name] = chunksBuffer.join ''
+								if columns[0].name is JSON_COLUMN_ID and @connection.config.parseJSON is true
+									try
+										row = JSON.parse chunksBuffer.join('')
+										if not @stream then recordsets[recordsets.length - 1][0] = row
+									catch ex
+										row = null
+										ex = RequestError new Error("Failed to parse incoming JSON. #{ex.message}"), 'EJSON'
+										
+										if @stream
+											@emit 'error', ex
+										
+										else
+											console.error ex
+								
+								else
+									row[columns[0].name] = chunksBuffer.join ''
+								
 								chunksBuffer = null
 								
 							if @verbose
@@ -341,7 +357,23 @@ module.exports = (Connection, Transaction, Request, ConnectionError, Transaction
 						unless @nested
 							if row
 								if isChunkedRecordset
-									row[columns[0].name] = chunksBuffer.join ''
+									if columns[0].name is JSON_COLUMN_ID and @connection.config.parseJSON is true
+										try
+											row = JSON.parse chunksBuffer.join('')
+											if not @stream then recordsets[recordsets.length - 1][0] = row
+										catch ex
+											row = null
+											ex = RequestError new Error("Failed to parse incoming JSON. #{ex.message}"), 'EJSON'
+											
+											if @stream
+												@emit 'error', ex
+											
+											else
+												console.error ex
+									
+									else
+										row[columns[0].name] = chunksBuffer.join ''
+									
 									chunksBuffer = null
 								
 								if @verbose