mssql 3.1.1 → 3.3.0

package/src/msnodesqlv8.coffee

@@ -322,7 +322,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
@@ -414,7 +430,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

package/src/tds.coffee

@@ -385,6 +385,16 @@ module.exports = (Connection, Transaction, Request, ConnectionError, Transaction
 						else
 							callback? error, if @multiple or @nested then recordsets else recordsets[0]
 					
+					req.on 'message', (msg) =>
+						@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', (err) =>
 						e = RequestError err, 'EREQUEST'
 						

package/src/tedious.coffee

@@ -290,8 +290,13 @@ module.exports = (Connection, Transaction, Request, ConnectionError, Transaction
 		_abort: ->
 			if not @_rollbackRequested
 				# transaction interrupted because of XACT_ABORT
+				
+				pc = @_pooledConnection
+				setImmediate =>
+					# defer releasing so connection can switch from SentClientRequest to LoggedIn state
+					@connection.pool.release pc
+					
 				@_pooledConnection.removeListener 'rollbackTransaction', @_abort
-				@connection.pool.release @_pooledConnection
 				@_pooledConnection = null
 				@_aborted = true
 				
@@ -381,6 +386,16 @@ module.exports = (Connection, Transaction, Request, ConnectionError, Transaction
 
 				# we must collect errors even in stream mode
 				errors.push e
+			
+			handleInfo = (msg) =>
+				@emit 'info',
+					message: msg.message
+					number: msg.number
+					state: msg.state
+					class: msg.class
+					lineNumber: msg.lineNumber
+					serverName: msg.serverName
+					procName: msg.procName
 
 			@_acquire (err, connection) =>
 				unless err
@@ -396,8 +411,10 @@ module.exports = (Connection, Transaction, Request, ConnectionError, Transaction
 						connection.cancel()
 					
 					# attach handler to handle multiple error messages
+					errorHandlers['infoMessage'] = handleInfo
 					errorHandlers['errorMessage'] = handleError.bind(undefined, false, connection)
 					errorHandlers['error']        = handleError.bind(undefined, true, connection)
+					connection.on 'infoMessage', errorHandlers['infoMessage']
 					connection.on 'errorMessage', errorHandlers['errorMessage']
 					connection.on 'error',        errorHandlers['error']
 
@@ -505,6 +522,16 @@ module.exports = (Connection, Transaction, Request, ConnectionError, Transaction
 				# we must collect errors even in stream mode
 				errors.push e
 			
+			handleInfo = (msg) =>
+				@emit 'info',
+					message: msg.message
+					number: msg.number
+					state: msg.state
+					class: msg.class
+					lineNumber: msg.lineNumber
+					serverName: msg.serverName
+					procName: msg.procName
+			
 			@_acquire (err, connection) =>
 				unless err
 					if @verbose then @_log "---------- sql #{if @_isBatch then 'batch' else 'query'} ----------\n    #{if @_isBatch then 'batch' else 'query'}: #{command}"
@@ -519,8 +546,10 @@ module.exports = (Connection, Transaction, Request, ConnectionError, Transaction
 						connection.cancel()
 					
 					# attach handler to handle multiple error messages
+					errorHandlers['infoMessage'] = handleInfo
 					errorHandlers['errorMessage'] = handleError.bind(undefined, false, connection)
 					errorHandlers['error']        = handleError.bind(undefined, true, connection)
+					connection.on 'infoMessage', errorHandlers['infoMessage']
 					connection.on 'errorMessage', errorHandlers['errorMessage']
 					connection.on 'error',        errorHandlers['error']