tedious 2.2.0 → 2.2.4

package/lib/connection.js

@@ -425,13 +425,13 @@ var Connection = function (_EventEmitter) {
   (0, _createClass3.default)(Connection, [{
     key: 'close',
     value: function close() {
-      return this.transitionTo(this.STATE.FINAL);
+      this.transitionTo(this.STATE.FINAL);
     }
   }, {
     key: 'initialiseConnection',
     value: function initialiseConnection() {
       this.connect();
-      return this.createConnectTimer();
+      this.createConnectTimer();
     }
   }, {
     key: 'cleanupConnection',
@@ -453,7 +453,7 @@ var Connection = function (_EventEmitter) {
         }
         this.closed = true;
         this.loggedIn = false;
-        return this.loginError = null;
+        this.loginError = null;
       }
     }
   }, {
@@ -462,8 +462,8 @@ var Connection = function (_EventEmitter) {
       var _this2 = this;
 
       this.debug = new Debug(this.config.options.debug);
-      return this.debug.on('debug', function (message) {
-        return _this2.emit('debug', message);
+      this.debug.on('debug', function (message) {
+        _this2.emit('debug', message);
       });
     }
   }, {
@@ -474,7 +474,7 @@ var Connection = function (_EventEmitter) {
       this.tokenStreamParser = new TokenStreamParser(this.debug, undefined, this.config.options);
 
       this.tokenStreamParser.on('infoMessage', function (token) {
-        return _this3.emit('infoMessage', token);
+        _this3.emit('infoMessage', token);
       });
 
       this.tokenStreamParser.on('sspichallenge', function (token) {
@@ -482,7 +482,8 @@ var Connection = function (_EventEmitter) {
           _this3.ntlmpacket = token.ntlmpacket;
           _this3.ntlmpacketBuffer = token.ntlmpacketBuffer;
         }
-        return _this3.emit('sspichallenge', token);
+
+        _this3.emit('sspichallenge', token);
       });
 
       this.tokenStreamParser.on('errorMessage', function (token) {
@@ -509,15 +510,15 @@ var Connection = function (_EventEmitter) {
       });
 
       this.tokenStreamParser.on('databaseChange', function (token) {
-        return _this3.emit('databaseChange', token.newValue);
+        _this3.emit('databaseChange', token.newValue);
       });
 
       this.tokenStreamParser.on('languageChange', function (token) {
-        return _this3.emit('languageChange', token.newValue);
+        _this3.emit('languageChange', token.newValue);
       });
 
       this.tokenStreamParser.on('charsetChange', function (token) {
-        return _this3.emit('charsetChange', token.newValue);
+        _this3.emit('charsetChange', token.newValue);
       });
 
       this.tokenStreamParser.on('loginack', function (token) {
@@ -537,30 +538,30 @@ var Connection = function (_EventEmitter) {
 
         // use negotiated version
         _this3.config.options.tdsVersion = token.tdsVersion;
-        return _this3.loggedIn = true;
+        _this3.loggedIn = true;
       });
 
       this.tokenStreamParser.on('routingChange', function (token) {
         _this3.routingData = token.newValue;
-        return _this3.dispatchEvent('routingChange');
+        _this3.dispatchEvent('routingChange');
       });
 
       this.tokenStreamParser.on('packetSizeChange', function (token) {
-        return _this3.messageIo.packetSize(token.newValue);
+        _this3.messageIo.packetSize(token.newValue);
       });
 
       // A new top-level transaction was started. This is not fired
       // for nested transactions.
       this.tokenStreamParser.on('beginTransaction', function (token) {
         _this3.transactionDescriptors.push(token.newValue);
-        return _this3.inTransaction = true;
+        _this3.inTransaction = true;
       });
 
       // A top-level transaction was committed. This is not fired
       // for nested transactions.
       this.tokenStreamParser.on('commitTransaction', function () {
         _this3.transactionDescriptors.length = 1;
-        return _this3.inTransaction = false;
+        _this3.inTransaction = false;
       });
 
       // A top-level transaction was rolled back. This is not fired
@@ -570,7 +571,7 @@ var Connection = function (_EventEmitter) {
         _this3.transactionDescriptors.length = 1;
         // An outermost transaction was rolled back. Reset the transaction counter
         _this3.inTransaction = false;
-        return _this3.emit('rollbackTransaction');
+        _this3.emit('rollbackTransaction');
       });
 
       this.tokenStreamParser.on('columnMetadata', function (token) {
@@ -587,19 +588,19 @@ var Connection = function (_EventEmitter) {
           } else {
             columns = token.columns;
           }
-          return _this3.request.emit('columnMetadata', columns);
+          _this3.request.emit('columnMetadata', columns);
         } else {
           _this3.emit('error', new Error("Received 'columnMetadata' when no sqlRequest is in progress"));
-          return _this3.close();
+          _this3.close();
         }
       });
 
       this.tokenStreamParser.on('order', function (token) {
         if (_this3.request) {
-          return _this3.request.emit('order', token.orderColumns);
+          _this3.request.emit('order', token.orderColumns);
         } else {
           _this3.emit('error', new Error("Received 'order' when no sqlRequest is in progress"));
-          return _this3.close();
+          _this3.close();
         }
       });
 
@@ -616,20 +617,20 @@ var Connection = function (_EventEmitter) {
           }
         } else {
           _this3.emit('error', new Error("Received 'row' when no sqlRequest is in progress"));
-          return _this3.close();
+          _this3.close();
         }
       });
 
       this.tokenStreamParser.on('returnStatus', function (token) {
         if (_this3.request) {
           // Keep value for passing in 'doneProc' event.
-          return _this3.procReturnStatusValue = token.value;
+          _this3.procReturnStatusValue = token.value;
         }
       });
 
       this.tokenStreamParser.on('returnValue', function (token) {
         if (_this3.request) {
-          return _this3.request.emit('returnValue', token.paramName, token.value, token.metadata);
+          _this3.request.emit('returnValue', token.paramName, token.value, token.metadata);
         }
       });
 
@@ -641,7 +642,7 @@ var Connection = function (_EventEmitter) {
             _this3.request.rowCount += token.rowCount;
           }
           if (_this3.config.options.rowCollectionOnDone) {
-            return _this3.request.rst = [];
+            _this3.request.rst = [];
           }
         }
       });
@@ -653,7 +654,7 @@ var Connection = function (_EventEmitter) {
             _this3.request.rowCount += token.rowCount;
           }
           if (_this3.config.options.rowCollectionOnDone) {
-            return _this3.request.rst = [];
+            _this3.request.rst = [];
           }
         }
       });
@@ -672,7 +673,7 @@ var Connection = function (_EventEmitter) {
             _this3.request.rowCount += token.rowCount;
           }
           if (_this3.config.options.rowCollectionOnDone) {
-            return _this3.request.rst = [];
+            _this3.request.rst = [];
           }
         }
       });
@@ -685,12 +686,12 @@ var Connection = function (_EventEmitter) {
       });
 
       this.tokenStreamParser.on('resetConnection', function () {
-        return _this3.emit('resetConnection');
+        _this3.emit('resetConnection');
       });
 
       this.tokenStreamParser.on('tokenStreamError', function (error) {
         _this3.emit('error', error);
-        return _this3.close();
+        _this3.close();
       });
 
       this.tokenStreamParser.on('drain', function () {
@@ -716,9 +717,9 @@ var Connection = function (_EventEmitter) {
             return;
           }
           if (message) {
-            return _this4.emit('connect', ConnectionError(message, 'EINSTLOOKUP'));
+            _this4.emit('connect', ConnectionError(message, 'EINSTLOOKUP'));
           } else {
-            return _this4.connectOnPort(port, _this4.config.options.multiSubnetFailover);
+            _this4.connectOnPort(port, _this4.config.options.multiSubnetFailover);
           }
         });
       }
@@ -739,6 +740,11 @@ var Connection = function (_EventEmitter) {
           return _this5.socketError(err);
         }
 
+        if (_this5.state === _this5.STATE.FINAL) {
+          socket.destroy();
+          return;
+        }
+
         _this5.socket = socket;
         _this5.socket.on('error', _this5.socketError);
         _this5.socket.on('close', _this5.socketClose);
@@ -765,14 +771,14 @@ var Connection = function (_EventEmitter) {
   }, {
     key: 'createConnectTimer',
     value: function createConnectTimer() {
-      return this.connectTimer = setTimeout(this.connectTimeout, this.config.options.connectTimeout);
+      this.connectTimer = setTimeout(this.connectTimeout, this.config.options.connectTimeout);
     }
   }, {
     key: 'createRequestTimer',
     value: function createRequestTimer() {
       this.clearRequestTimer(); // release old timer, just to be safe
       if (this.config.options.requestTimeout) {
-        return this.requestTimer = setTimeout(this.requestTimeout, this.config.options.requestTimeout);
+        this.requestTimer = setTimeout(this.requestTimeout, this.config.options.requestTimeout);
       }
     }
   }, {
@@ -788,14 +794,14 @@ var Connection = function (_EventEmitter) {
       this.debug.log(message);
       this.emit('connect', ConnectionError(message, 'ETIMEOUT'));
       this.connectTimer = undefined;
-      return this.dispatchEvent('connectTimeout');
+      this.dispatchEvent('connectTimeout');
     }
   }, {
     key: 'requestTimeout',
     value: function requestTimeout() {
       this.requestTimer = undefined;
       this.messageIo.sendMessage(TYPE.ATTENTION);
-      return this.transitionTo(this.STATE.SENT_ATTENTION);
+      this.transitionTo(this.STATE.SENT_ATTENTION);
     }
   }, {
     key: 'retryTimeout',
@@ -808,7 +814,7 @@ var Connection = function (_EventEmitter) {
     key: 'clearConnectTimer',
     value: function clearConnectTimer() {
       if (this.connectTimer) {
-        return clearTimeout(this.connectTimer);
+        clearTimeout(this.connectTimer);
       }
     }
   }, {
@@ -843,7 +849,7 @@ var Connection = function (_EventEmitter) {
       this.state = newState;
 
       if (this.state.enter) {
-        return this.state.enter.apply(this);
+        this.state.enter.apply(this);
       }
     }
   }, {
@@ -854,10 +860,10 @@ var Connection = function (_EventEmitter) {
         for (var i = 0; i < args.length;) {
           args[i++] = arguments[i];
         }
-        return this.state.events[eventName].apply(this, args);
+        this.state.events[eventName].apply(this, args);
       } else {
         this.emit('error', new Error(`No event '${eventName}' in state '${this.state.name}'`));
-        return this.close();
+        this.close();
       }
     }
   }, {
@@ -872,7 +878,7 @@ var Connection = function (_EventEmitter) {
         this.debug.log(_message);
         this.emit('error', ConnectionError(_message, 'ESOCKET'));
       }
-      return this.dispatchEvent('socketError', error);
+      this.dispatchEvent('socketError', error);
     }
   }, {
     key: 'socketConnect',
@@ -880,13 +886,13 @@ var Connection = function (_EventEmitter) {
       this.socket.setKeepAlive(true, KEEP_ALIVE_INITIAL_DELAY);
       this.closed = false;
       this.debug.log('connected to ' + this.config.server + ':' + this.config.options.port);
-      return this.dispatchEvent('socketConnect');
+      this.dispatchEvent('socketConnect');
     }
   }, {
     key: 'socketEnd',
     value: function socketEnd() {
       this.debug.log('socket ended');
-      return this.transitionTo(this.STATE.FINAL);
+      this.transitionTo(this.STATE.FINAL);
     }
   }, {
     key: 'socketClose',
@@ -894,15 +900,15 @@ var Connection = function (_EventEmitter) {
       this.debug.log('connection to ' + this.config.server + ':' + this.config.options.port + ' closed');
       if (this.state === this.STATE.REROUTING) {
         this.debug.log('Rerouting to ' + this.routingData.server + ':' + this.routingData.port);
-        return this.dispatchEvent('reconnect');
+        this.dispatchEvent('reconnect');
       } else if (this.state === this.STATE.TRANSIENT_FAILURE_RETRY) {
         var server = this.routingData ? this.routingData.server : this.server;
         var port = this.routingData ? this.routingData.port : this.config.options.port;
         this.debug.log('Retry after transient failure connecting to ' + server + ':' + port);
 
-        return this.dispatchEvent('retry');
+        this.dispatchEvent('retry');
       } else {
-        return this.transitionTo(this.STATE.FINAL);
+        this.transitionTo(this.STATE.FINAL);
       }
     }
   }, {
@@ -912,19 +918,19 @@ var Connection = function (_EventEmitter) {
         encrypt: this.config.options.encrypt
       });
       this.messageIo.sendMessage(TYPE.PRELOGIN, payload.data);
-      return this.debug.payload(function () {
+      this.debug.payload(function () {
         return payload.toString('  ');
       });
     }
   }, {
     key: 'emptyMessageBuffer',
     value: function emptyMessageBuffer() {
-      return this.messageBuffer = new Buffer(0);
+      this.messageBuffer = new Buffer(0);
     }
   }, {
     key: 'addToMessageBuffer',
     value: function addToMessageBuffer(data) {
-      return this.messageBuffer = Buffer.concat([this.messageBuffer, data]);
+      this.messageBuffer = Buffer.concat([this.messageBuffer, data]);
     }
   }, {
     key: 'processPreLoginResponse',
@@ -940,9 +946,9 @@ var Connection = function (_EventEmitter) {
           return this.close();
         }
 
-        return this.dispatchEvent('tls');
+        this.dispatchEvent('tls');
       } else {
-        return this.dispatchEvent('noTls');
+        this.dispatchEvent('noTls');
       }
     }
   }, {
@@ -1130,54 +1136,54 @@ var Connection = function (_EventEmitter) {
     key: 'processedInitialSql',
     value: function processedInitialSql() {
       this.clearConnectTimer();
-      return this.emit('connect');
+      this.emit('connect');
     }
   }, {
     key: 'processLogin7Response',
     value: function processLogin7Response() {
       if (this.loggedIn) {
-        return this.dispatchEvent('loggedIn');
+        this.dispatchEvent('loggedIn');
       } else {
         if (this.loginError) {
           this.emit('connect', this.loginError);
         } else {
           this.emit('connect', ConnectionError('Login failed.', 'ELOGIN'));
         }
-        return this.dispatchEvent('loginFailed');
+        this.dispatchEvent('loginFailed');
       }
     }
   }, {
     key: 'processLogin7NTLMResponse',
     value: function processLogin7NTLMResponse() {
       if (this.ntlmpacket) {
-        return this.dispatchEvent('receivedChallenge');
+        this.dispatchEvent('receivedChallenge');
       } else {
         if (this.loginError) {
           this.emit('connect', this.loginError);
         } else {
           this.emit('connect', ConnectionError('Login failed.', 'ELOGIN'));
         }
-        return this.dispatchEvent('loginFailed');
+        this.dispatchEvent('loginFailed');
       }
     }
   }, {
     key: 'processLogin7NTLMAck',
     value: function processLogin7NTLMAck() {
       if (this.loggedIn) {
-        return this.dispatchEvent('loggedIn');
+        this.dispatchEvent('loggedIn');
       } else {
         if (this.loginError) {
           this.emit('connect', this.loginError);
         } else {
           this.emit('connect', ConnectionError('Login failed.', 'ELOGIN'));
         }
-        return this.dispatchEvent('loginFailed');
+        this.dispatchEvent('loginFailed');
       }
     }
   }, {
     key: 'execSqlBatch',
     value: function execSqlBatch(request) {
-      return this.makeRequest(request, TYPE.SQL_BATCH, new SqlBatchPayload(request.sqlTextOrProcedure, this.currentTransactionDescriptor(), this.config.options));
+      this.makeRequest(request, TYPE.SQL_BATCH, new SqlBatchPayload(request.sqlTextOrProcedure, this.currentTransactionDescriptor(), this.config.options));
     }
   }, {
     key: 'execSql',
@@ -1185,13 +1191,16 @@ var Connection = function (_EventEmitter) {
       var _this6 = this;
 
       request.transformIntoExecuteSqlRpc();
+
       if (request.error != null) {
-        return process.nextTick(function () {
+        process.nextTick(function () {
           _this6.debug.log(request.error.message);
-          return request.callback(request.error);
+          request.callback(request.error);
         });
+        return;
       }
-      return this.makeRequest(request, TYPE.RPC_REQUEST, new RpcRequestPayload(request, this.currentTransactionDescriptor(), this.config.options));
+
+      this.makeRequest(request, TYPE.RPC_REQUEST, new RpcRequestPayload(request, this.currentTransactionDescriptor(), this.config.options));
     }
 
     /**
@@ -1228,24 +1237,25 @@ var Connection = function (_EventEmitter) {
             error.message += ' This is likely because the schema of the BulkLoad does not match the schema of the table you are attempting to insert into.';
           }
           bulkLoad.error = error;
-          return bulkLoad.callback(error);
+          bulkLoad.callback(error);
         } else {
-          return _this7.makeRequest(bulkLoad, TYPE.BULK_LOAD, bulkLoad.getPayload());
+          _this7.makeRequest(bulkLoad, TYPE.BULK_LOAD, bulkLoad.getPayload());
         }
       });
-      return this.execSqlBatch(request);
+
+      this.execSqlBatch(request);
     }
   }, {
     key: 'prepare',
     value: function prepare(request) {
       request.transformIntoPrepareRpc();
-      return this.makeRequest(request, TYPE.RPC_REQUEST, new RpcRequestPayload(request, this.currentTransactionDescriptor(), this.config.options));
+      this.makeRequest(request, TYPE.RPC_REQUEST, new RpcRequestPayload(request, this.currentTransactionDescriptor(), this.config.options));
     }
   }, {
     key: 'unprepare',
     value: function unprepare(request) {
       request.transformIntoUnprepareRpc();
-      return this.makeRequest(request, TYPE.RPC_REQUEST, new RpcRequestPayload(request, this.currentTransactionDescriptor(), this.config.options));
+      this.makeRequest(request, TYPE.RPC_REQUEST, new RpcRequestPayload(request, this.currentTransactionDescriptor(), this.config.options));
     }
   }, {
     key: 'execute',
@@ -1253,13 +1263,17 @@ var Connection = function (_EventEmitter) {
       var _this8 = this;
 
       request.transformIntoExecuteRpc(parameters);
+
       if (request.error != null) {
-        return process.nextTick(function () {
+        process.nextTick(function () {
           _this8.debug.log(request.error.message);
-          return request.callback(request.error);
+          request.callback(request.error);
         });
+
+        return;
       }
-      return this.makeRequest(request, TYPE.RPC_REQUEST, new RpcRequestPayload(request, this.currentTransactionDescriptor(), this.config.options));
+
+      this.makeRequest(request, TYPE.RPC_REQUEST, new RpcRequestPayload(request, this.currentTransactionDescriptor(), this.config.options));
     }
   }, {
     key: 'callProcedure',
@@ -1267,13 +1281,16 @@ var Connection = function (_EventEmitter) {
       var _this9 = this;
 
       request.validateParameters();
+
       if (request.error != null) {
-        return process.nextTick(function () {
+        process.nextTick(function () {
           _this9.debug.log(request.error.message);
-          return request.callback(request.error);
+          request.callback(request.error);
         });
+        return;
       }
-      return this.makeRequest(request, TYPE.RPC_REQUEST, new RpcRequestPayload(request, this.currentTransactionDescriptor(), this.config.options));
+
+      this.makeRequest(request, TYPE.RPC_REQUEST, new RpcRequestPayload(request, this.currentTransactionDescriptor(), this.config.options));
     }
   }, {
     key: 'beginTransaction',
@@ -1420,7 +1437,7 @@ var Connection = function (_EventEmitter) {
       if (this.state !== this.STATE.LOGGED_IN) {
         var message = 'Requests can only be made in the ' + this.STATE.LOGGED_IN.name + ' state, not the ' + this.state.name + ' state';
         this.debug.log(message);
-        return request.callback(RequestError(message, 'EINVALIDSTATE'));
+        request.callback(RequestError(message, 'EINVALIDSTATE'));
       } else {
         if (packetType === TYPE.SQL_BATCH) {
           this.isSqlBatch = true;
@@ -1504,71 +1521,71 @@ Connection.prototype.STATE = {
   CONNECTING: {
     name: 'Connecting',
     enter: function enter() {
-      return this.initialiseConnection();
+      this.initialiseConnection();
     },
     events: {
       socketError: function socketError() {
-        return this.transitionTo(this.STATE.FINAL);
+        this.transitionTo(this.STATE.FINAL);
       },
       connectTimeout: function connectTimeout() {
-        return this.transitionTo(this.STATE.FINAL);
+        this.transitionTo(this.STATE.FINAL);
       },
       socketConnect: function socketConnect() {
         this.sendPreLogin();
-        return this.transitionTo(this.STATE.SENT_PRELOGIN);
+        this.transitionTo(this.STATE.SENT_PRELOGIN);
       }
     }
   },
   SENT_PRELOGIN: {
     name: 'SentPrelogin',
     enter: function enter() {
-      return this.emptyMessageBuffer();
+      this.emptyMessageBuffer();
     },
     events: {
       socketError: function socketError() {
-        return this.transitionTo(this.STATE.FINAL);
+        this.transitionTo(this.STATE.FINAL);
       },
       connectTimeout: function connectTimeout() {
-        return this.transitionTo(this.STATE.FINAL);
+        this.transitionTo(this.STATE.FINAL);
       },
       data: function data(_data) {
-        return this.addToMessageBuffer(_data);
+        this.addToMessageBuffer(_data);
       },
       message: function message() {
-        return this.processPreLoginResponse();
+        this.processPreLoginResponse();
       },
       noTls: function noTls() {
         var _this12 = this;
 
         this.sendLogin7Packet(function () {
           if (_this12.config.domain) {
-            return _this12.transitionTo(_this12.STATE.SENT_LOGIN7_WITH_NTLM);
+            _this12.transitionTo(_this12.STATE.SENT_LOGIN7_WITH_NTLM);
           } else {
-            return _this12.transitionTo(_this12.STATE.SENT_LOGIN7_WITH_STANDARD_LOGIN);
+            _this12.transitionTo(_this12.STATE.SENT_LOGIN7_WITH_STANDARD_LOGIN);
           }
         });
       },
       tls: function tls() {
         this.messageIo.startTls(this.config.options.cryptoCredentialsDetails, this.config.server, this.config.options.trustServerCertificate);
-        return this.transitionTo(this.STATE.SENT_TLSSSLNEGOTIATION);
+        this.transitionTo(this.STATE.SENT_TLSSSLNEGOTIATION);
       }
     }
   },
   REROUTING: {
     name: 'ReRouting',
     enter: function enter() {
-      return this.cleanupConnection(this.cleanupTypeEnum.REDIRECT);
+      this.cleanupConnection(this.cleanupTypeEnum.REDIRECT);
     },
     events: {
       message: function message() {},
       socketError: function socketError() {
-        return this.transitionTo(this.STATE.FINAL);
+        this.transitionTo(this.STATE.FINAL);
       },
       connectTimeout: function connectTimeout() {
-        return this.transitionTo(this.STATE.FINAL);
+        this.transitionTo(this.STATE.FINAL);
       },
       reconnect: function reconnect() {
-        return this.transitionTo(this.STATE.CONNECTING);
+        this.transitionTo(this.STATE.CONNECTING);
       }
     }
   },
@@ -1576,15 +1593,15 @@ Connection.prototype.STATE = {
     name: 'TRANSIENT_FAILURE_RETRY',
     enter: function enter() {
       this.curTransientRetryCount++;
-      return this.cleanupConnection(this.cleanupTypeEnum.RETRY);
+      this.cleanupConnection(this.cleanupTypeEnum.RETRY);
     },
     events: {
       message: function message() {},
       socketError: function socketError() {
-        return this.transitionTo(this.STATE.FINAL);
+        this.transitionTo(this.STATE.FINAL);
       },
       connectTimeout: function connectTimeout() {
-        return this.transitionTo(this.STATE.FINAL);
+        this.transitionTo(this.STATE.FINAL);
       },
       retry: function retry() {
         this.createRetryTimer();
@@ -1595,13 +1612,13 @@ Connection.prototype.STATE = {
     name: 'SentTLSSSLNegotiation',
     events: {
       socketError: function socketError() {
-        return this.transitionTo(this.STATE.FINAL);
+        this.transitionTo(this.STATE.FINAL);
       },
       connectTimeout: function connectTimeout() {
-        return this.transitionTo(this.STATE.FINAL);
+        this.transitionTo(this.STATE.FINAL);
       },
       data: function data(_data2) {
-        return this.messageIo.tlsHandshakeData(_data2);
+        this.messageIo.tlsHandshakeData(_data2);
       },
       message: function message() {
         var _this13 = this;
@@ -1609,9 +1626,9 @@ Connection.prototype.STATE = {
         if (this.messageIo.tlsNegotiationComplete) {
           this.sendLogin7Packet(function () {
             if (_this13.config.domain) {
-              return _this13.transitionTo(_this13.STATE.SENT_LOGIN7_WITH_NTLM);
+              _this13.transitionTo(_this13.STATE.SENT_LOGIN7_WITH_NTLM);
             } else {
-              return _this13.transitionTo(_this13.STATE.SENT_LOGIN7_WITH_STANDARD_LOGIN);
+              _this13.transitionTo(_this13.STATE.SENT_LOGIN7_WITH_STANDARD_LOGIN);
             }
           });
         }
@@ -1622,25 +1639,25 @@ Connection.prototype.STATE = {
     name: 'SentLogin7WithStandardLogin',
     events: {
       socketError: function socketError() {
-        return this.transitionTo(this.STATE.FINAL);
+        this.transitionTo(this.STATE.FINAL);
       },
       connectTimeout: function connectTimeout() {
-        return this.transitionTo(this.STATE.FINAL);
+        this.transitionTo(this.STATE.FINAL);
       },
       data: function data(_data3) {
-        return this.sendDataToTokenStreamParser(_data3);
+        this.sendDataToTokenStreamParser(_data3);
       },
       loggedIn: function loggedIn() {
-        return this.transitionTo(this.STATE.LOGGED_IN_SENDING_INITIAL_SQL);
+        this.transitionTo(this.STATE.LOGGED_IN_SENDING_INITIAL_SQL);
       },
       routingChange: function routingChange() {
-        return this.transitionTo(this.STATE.REROUTING);
+        this.transitionTo(this.STATE.REROUTING);
       },
       loginFailed: function loginFailed() {
-        return this.transitionTo(this.STATE.FINAL);
+        this.transitionTo(this.STATE.FINAL);
       },
       message: function message() {
-        return this.processLogin7Response();
+        this.processLogin7Response();
       }
     }
   },
@@ -1648,22 +1665,22 @@ Connection.prototype.STATE = {
     name: 'SentLogin7WithNTLMLogin',
     events: {
       socketError: function socketError() {
-        return this.transitionTo(this.STATE.FINAL);
+        this.transitionTo(this.STATE.FINAL);
       },
       connectTimeout: function connectTimeout() {
-        return this.transitionTo(this.STATE.FINAL);
+        this.transitionTo(this.STATE.FINAL);
       },
       data: function data(_data4) {
-        return this.sendDataToTokenStreamParser(_data4);
+        this.sendDataToTokenStreamParser(_data4);
       },
       receivedChallenge: function receivedChallenge() {
-        return this.sendNTLMResponsePacket();
+        this.sendNTLMResponsePacket();
       },
       loginFailed: function loginFailed() {
-        return this.transitionTo(this.STATE.FINAL);
+        this.transitionTo(this.STATE.FINAL);
       },
       message: function message() {
-        return this.processLogin7NTLMResponse();
+        this.processLogin7NTLMResponse();
       }
     }
   },
@@ -1671,43 +1688,43 @@ Connection.prototype.STATE = {
     name: 'SentNTLMResponse',
     events: {
       socketError: function socketError() {
-        return this.transitionTo(this.STATE.FINAL);
+        this.transitionTo(this.STATE.FINAL);
       },
       connectTimeout: function connectTimeout() {
-        return this.transitionTo(this.STATE.FINAL);
+        this.transitionTo(this.STATE.FINAL);
       },
       data: function data(_data5) {
-        return this.sendDataToTokenStreamParser(_data5);
+        this.sendDataToTokenStreamParser(_data5);
       },
       loggedIn: function loggedIn() {
-        return this.transitionTo(this.STATE.LOGGED_IN_SENDING_INITIAL_SQL);
+        this.transitionTo(this.STATE.LOGGED_IN_SENDING_INITIAL_SQL);
       },
       loginFailed: function loginFailed() {
-        return this.transitionTo(this.STATE.FINAL);
+        this.transitionTo(this.STATE.FINAL);
       },
       routingChange: function routingChange() {
-        return this.transitionTo(this.STATE.REROUTING);
+        this.transitionTo(this.STATE.REROUTING);
       },
       message: function message() {
-        return this.processLogin7NTLMAck();
+        this.processLogin7NTLMAck();
       }
     }
   },
   LOGGED_IN_SENDING_INITIAL_SQL: {
     name: 'LoggedInSendingInitialSql',
     enter: function enter() {
-      return this.sendInitialSql();
+      this.sendInitialSql();
     },
     events: {
       connectTimeout: function connectTimeout() {
-        return this.transitionTo(this.STATE.FINAL);
+        this.transitionTo(this.STATE.FINAL);
       },
       data: function data(_data6) {
-        return this.sendDataToTokenStreamParser(_data6);
+        this.sendDataToTokenStreamParser(_data6);
       },
       message: function message() {
         this.transitionTo(this.STATE.LOGGED_IN);
-        return this.processedInitialSql();
+        this.processedInitialSql();
       }
     }
   },
@@ -1715,7 +1732,7 @@ Connection.prototype.STATE = {
     name: 'LoggedIn',
     events: {
       socketError: function socketError() {
-        return this.transitionTo(this.STATE.FINAL);
+        this.transitionTo(this.STATE.FINAL);
       }
     }
   },
@@ -1733,7 +1750,7 @@ Connection.prototype.STATE = {
         var sqlRequest = this.request;
         this.request = undefined;
         sqlRequest.callback(err);
-        return this.transitionTo(this.STATE.FINAL);
+        this.transitionTo(this.STATE.FINAL);
       },
       data: function data(_data7) {
         this.clearRequestTimer(); // request timer is stopped on first data package
@@ -1748,7 +1765,7 @@ Connection.prototype.STATE = {
         // We have to channel the 'message' (EOM) event through the token stream
         // parser transform, to keep it in line with the flow of the tokens, when
         // the incoming data flow is paused and resumed.
-        return this.tokenStreamParser.addEndOfMessageMarker();
+        this.tokenStreamParser.addEndOfMessageMarker();
       },
       endOfMessageMarkerReceived: function endOfMessageMarkerReceived() {
         this.transitionTo(this.STATE.LOGGED_IN);
@@ -1757,24 +1774,24 @@ Connection.prototype.STATE = {
         if (this.config.options.tdsVersion < '7_2' && sqlRequest.error && this.isSqlBatch) {
           this.inTransaction = false;
         }
-        return sqlRequest.callback(sqlRequest.error, sqlRequest.rowCount, sqlRequest.rows);
+        sqlRequest.callback(sqlRequest.error, sqlRequest.rowCount, sqlRequest.rows);
       }
     }
   },
   SENT_ATTENTION: {
     name: 'SentAttention',
     enter: function enter() {
-      return this.attentionReceived = false;
+      this.attentionReceived = false;
     },
     events: {
       socketError: function socketError() {
-        return this.transitionTo(this.STATE.FINAL);
+        this.transitionTo(this.STATE.FINAL);
       },
       data: function data(_data8) {
-        return this.sendDataToTokenStreamParser(_data8);
+        this.sendDataToTokenStreamParser(_data8);
       },
       attention: function attention() {
-        return this.attentionReceived = true;
+        this.attentionReceived = true;
       },
       message: function message() {
         // 3.2.5.7 Sent Attention State
@@ -1784,10 +1801,10 @@ Connection.prototype.STATE = {
           this.request = undefined;
           this.transitionTo(this.STATE.LOGGED_IN);
           if (sqlRequest.canceled) {
-            return sqlRequest.callback(RequestError('Canceled.', 'ECANCEL'));
+            sqlRequest.callback(RequestError('Canceled.', 'ECANCEL'));
           } else {
             var message = 'Timeout: Request failed to complete in ' + this.config.options.requestTimeout + 'ms';
-            return sqlRequest.callback(RequestError(message, 'ETIMEOUT'));
+            sqlRequest.callback(RequestError(message, 'ETIMEOUT'));
           }
         }
       }
@@ -1796,7 +1813,7 @@ Connection.prototype.STATE = {
   FINAL: {
     name: 'Final',
     enter: function enter() {
-      return this.cleanupConnection(this.cleanupTypeEnum.NORMAL);
+      this.cleanupConnection(this.cleanupTypeEnum.NORMAL);
     },
     events: {
       loginFailed: function loginFailed() {