Comparing version 0.10.4 to 0.10.5
@@ -6,2 +6,8 @@ Backlog: | ||
0.10.5 | ||
- node-mysql compatibility: remove 'number of results in response' | ||
callback argument (Brian White) #46 40af0530403a3892743d32974055c5ea23cbd3ec | ||
- node 0.11 (use on('data') instead os ondata ) 39906c78b85a77e468694814a50f99714d7bbbd6 | ||
- fix again ssl (#41) 713051bf997a186774b618cde583707320a1d551 | ||
0.10.4 | ||
@@ -8,0 +14,0 @@ - node-mysql compatibility: remove 'number of results in response' |
@@ -1,5 +0,5 @@ | ||
var mysql = require('../test/common').createConnection({multipleStatements: true}); | ||
var mysql = require('../test/common').createConnection(); | ||
mysql.query("INSERT INTO insert_test VALUES(1234578,'test'); INSERT INTO insert_test VALUES(1234579,'test')", function(err, rows, fields) { | ||
console.log(err, rows, fields); | ||
mysql.query("select * from foos limit 10", function(err, rows, fields) { | ||
console.log(rows, fields); | ||
}); |
@@ -29,7 +29,15 @@ var Command = require('./command'); | ||
if (this.onResult) { | ||
var rows, fields; | ||
if (this._resultIndex === 0) { | ||
this.onResult(null, this._rows[0], this._fields[0]); | ||
rows = this._rows[0]; | ||
fields = this._fields[0]; | ||
} else { | ||
this.onResult(null, this._rows, this._fields); | ||
rows = this._rows; | ||
fields = this._fields; | ||
} | ||
if (fields) { | ||
this.onResult(null, rows, fields); | ||
} else { | ||
this.onResult(null, rows); | ||
} | ||
} | ||
@@ -36,0 +44,0 @@ return null; |
@@ -68,11 +68,17 @@ var net = require('net'); | ||
if (this.stream instanceof net.Stream) { | ||
this.stream.ondata = function(data, start, end) { | ||
connection.packetParser.execute(data, start, end); | ||
}; | ||
} else { | ||
// TODO: this code used to be an optimized version of handler | ||
// DOES NOT WORK IN NODE 11 | ||
// TODO: measure if we actually get something here | ||
// if yes, re-enable for node 10 | ||
//if (this.stream instanceof net.Stream) { | ||
// debugger; | ||
// this.stream.ondata = function(data, start, end) { | ||
// debugger; | ||
// connection.packetParser.execute(data, start, end); | ||
// }; | ||
//} else { | ||
this.stream.on('data', function(data) { | ||
connection.packetParser.execute(data.parent, data.offset, data.offset + data.length); | ||
connection.packetParser.execute(data, 0, data.length); | ||
}); | ||
} | ||
//} | ||
this._protocolError = null; | ||
@@ -79,0 +85,0 @@ this.stream.on('end', function() { |
@@ -1,2 +0,2 @@ | ||
"handshake handshake_response query resultset_header column_definition text_row binary_row prepare_statement prepared_statement_header execute".split(' ').forEach(function(name) { | ||
"ssl_request handshake handshake_response query resultset_header column_definition text_row binary_row prepare_statement prepared_statement_header execute".split(' ').forEach(function(name) { | ||
var ctor = require('./' + name); | ||
@@ -3,0 +3,0 @@ module.exports[ctor.name] = ctor; |
{ | ||
"name": "mysql2", | ||
"version": "0.10.4", | ||
"version": "0.10.5", | ||
"description": "fast mysql driver. Implements core protocol, prepared statements, ssl and compression in native JS", | ||
@@ -5,0 +5,0 @@ "main": "index.js", |
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
216815
5079