Merge pull request #374 from sidorares/fix-char-encoding

Fixes #302

Author: sushantdhiman

.travis.yml

@@ -8,7 +8,7 @@ node_js:
   - '0.12'
   - '4.5'
   - '5.12'
-  - '6.4'
+  - '6.5'
 
 
 script:

examples/server.js

@@ -26,7 +26,9 @@ server.on('connection', function(conn) {
     connectionId: 1234,
     statusFlags: 2,
     characterSet: 8,
-    capabilityFlags: 0xffffff,
+    //capabilityFlags: 0xffffff,
+    //capabilityFlags: -2113931265,
+    capabilityFlags: 2181036031,
     authCallback: authenticate
   });
 

index.js

@@ -46,4 +46,14 @@ exports.__defineGetter__('createPoolClusterPromise', function () {
   return require('./promise.js').createPoolCluster;
 });
 
-module.exports.Types = require('./lib/constants/types.js');
+exports.__defineGetter__('Types', function () {
+  return require('./lib/constants/types.js');
+});
+
+exports.__defineGetter__('Charsets', function () {
+  return require('./lib/constants/charsets.js');
+});
+
+exports.__defineGetter__('CharsetToEncoding', function () {
+  return require('./lib/constants/charset_encodings.js');
+});

lib/commands/client_handshake.js

@@ -3,6 +3,7 @@ var util = require('util');
 var Command = require('./command.js');
 var Packets = require('../packets/index.js');
 var ClientConstants = require('../constants/client.js');
+var CharsetToEncoding = require('../constants/charset_encodings.js');
 
 function ClientHandshake (clientFlags)
 {
@@ -17,7 +18,7 @@ ClientHandshake.prototype.start = function () {
 };
 
 ClientHandshake.prototype.sendSSLRequest = function (connection) {
-  var sslRequest = new Packets.SSLRequest(this.clientFlags);
+  var sslRequest = new Packets.SSLRequest(this.clientFlags, connection.config.charsetNumber);
   connection.writePacket(sslRequest.toPacket());
 };
 
@@ -85,6 +86,7 @@ ClientHandshake.prototype.handshakeInit = function (helloPacket, connection) {
       flagNames(this.handshake.capabilityFlags).join(', '));
   }
   connection.serverCapabilityFlags = this.handshake.capabilityFlags;
+  connection.serverEncoding = CharsetToEncoding[this.handshake.characterSet];
   connection.connectionId = this.handshake.connectionId;
   var serverSSLSupport = this.handshake.capabilityFlags & ClientConstants.SSL;
 

lib/commands/command.js

@@ -25,7 +25,7 @@ Command.prototype.execute = function (packet, connection) {
   }
 
   if (packet && packet.isError()) {
-    var err = packet.asError();
+    var err = packet.asError(connection.serverEncoding);
     if (this.onResult) {
       this.onResult(err);
     } else {

lib/commands/execute.js

@@ -40,7 +40,7 @@ Execute.prototype.buildParserFromFields = function (fields, connection) {
 };
 
 Execute.prototype.start = function (packet, connection) {
-  var executePacket = new Packets.Execute(this.statement.id, this.parameters);
+  var executePacket = new Packets.Execute(this.statement.id, this.parameters, connection.config.charsetNumber);
   connection.writePacket(executePacket.toPacket(1));
   return Execute.prototype.resultsetHeader;
 };

lib/commands/prepare.js

@@ -21,7 +21,8 @@ function Prepare (options, callback)
 util.inherits(Prepare, Command);
 
 Prepare.prototype.start = function (packet, connection) {
-  connection.writePacket(new Packets.PrepareStatement(this.query).toPacket(1));
+  var cmdPacket = new Packets.PrepareStatement(this.query, connection.config.charsetNumber);
+  connection.writePacket(cmdPacket.toPacket(1));
   return Prepare.prototype.prepareHeader;
 };
 

lib/commands/query.js

@@ -35,7 +35,7 @@ Query.prototype.start = function (packet, connection) {
     console.log('        Sending query command: %s', this.sql);
   }
   this._connection = connection;
-  var cmdPacket = new Packets.Query(this.sql);
+  var cmdPacket = new Packets.Query(this.sql, connection.config.charsetNumber);
   connection.writePacket(cmdPacket.toPacket(1));
   return Query.prototype.resultsetHeader;
 };
@@ -85,7 +85,7 @@ Query.prototype.doneInsert = function (rs) {
 };
 
 Query.prototype.resultsetHeader = function (packet, connection) {
-  var rs = new Packets.ResultSetHeader(packet, connection.config.bigNumberStrings);
+  var rs = new Packets.ResultSetHeader(packet, connection.config.bigNumberStrings, connection.serverEncoding);
   this._fieldCount = rs.fieldCount;
   if (connection.config.debug) {
     console.log('        Resultset header received, expecting ' + rs.fieldCount + ' column definition packets');

lib/commands/server_handshake.js

@@ -39,6 +39,10 @@ ServerHandshake.prototype.start = function (packet, connection) {
 ServerHandshake.prototype.readClientReply = function (packet, connection) {
   // check auth here
   var clientHelloReply = new Packets.HandshakeResponse.fromPacket(packet);
+
+  // TODO check we don't have something similar already
+  connection.clientHelloReply = clientHelloReply;
+
   if (this.args.authCallback) {
     try {
       this.args.authCallback({
@@ -73,6 +77,7 @@ ServerHandshake.prototype.readClientReply = function (packet, connection) {
 ServerHandshake.prototype.dispatchCommands = function (packet, connection) {
   // command from client to server
   var knownCommand = true;
+  var encoding = connection.clientHelloReply.encoding;
   var commandCode = packet.readInt8();
   switch (commandCode) {
   case CommandCode.QUIT:
@@ -85,7 +90,7 @@ ServerHandshake.prototype.dispatchCommands = function (packet, connection) {
 
   case CommandCode.INIT_DB:
     if (connection.listeners('init_db').length) {
-      var schemaName = packet.readString();
+      var schemaName = packet.readString(encoding);
       connection.emit('init_db', schemaName);
     } else {
       connection.writeOk();
@@ -94,7 +99,7 @@ ServerHandshake.prototype.dispatchCommands = function (packet, connection) {
 
   case CommandCode.QUERY:
     if (connection.listeners('query').length) {
-      var query = packet.readString();
+      var query = packet.readString(undefined, encoding);
       connection.emit('query', query);
     } else {
       connection.writeError({
@@ -107,7 +112,7 @@ ServerHandshake.prototype.dispatchCommands = function (packet, connection) {
   case CommandCode.FIELD_LIST:
     if (connection.listeners('field_list').length) {
       var table = packet.readNullTerminatedString();
-      var fields = packet.readString();
+      var fields = packet.readString(encoding);
       connection.emit('field_list', table, fields);
     } else {
       connection.writeError({

lib/compile_binary_parser.js

@@ -2,6 +2,7 @@ var vm = require('vm');
 
 var FieldFlags = require('./constants/field_flags.js');
 var Charsets = require('./constants/charsets.js');
+var CharsetToEncoding = require('./constants/charset_encodings.js');
 var Types = require('./constants/types.js');
 var srcEscape = require('./helpers').srcEscape;
 
@@ -98,7 +99,6 @@ function compile (fields, options, config) {
 function readCodeFor (field, config, options) {
   var supportBigNumbers = options.supportBigNumbers || config.supportBigNumbers;
   var bigNumberStrings = options.bigNumberStrings || config.bigNumberStrings;
-
   var unsigned = field.flags & FieldFlags.UNSIGNED;
   switch (field.columnType) {
   case Types.TINY:
@@ -131,11 +131,11 @@ function readCodeFor (field, config, options) {
     if (config.decimalNumbers) {
       return 'packet.parseLengthCodedFloat();';
     }
-    return 'packet.readLengthCodedString();';
+    return 'packet.readLengthCodedString("ascii");';
   case Types.GEOMETRY:
     return 'packet.parseGeometryValue();';
   case Types.JSON:
-    return 'JSON.parse(packet.readLengthCodedString());';
+    return 'JSON.parse(packet.readLengthCodedString("' + CharsetToEncoding[field.characterSet] + '"));';
   case Types.LONGLONG:
     if (!supportBigNumbers) {
       return unsigned ? 'packet.readInt64JSNumber();' : 'packet.readSInt64JSNumber();';
@@ -150,7 +150,7 @@ function readCodeFor (field, config, options) {
     if (field.characterSet == Charsets.BINARY) {
       return 'packet.readLengthCodedBuffer();';
     } else {
-      return 'packet.readLengthCodedString();';
+      return 'packet.readLengthCodedString("' + CharsetToEncoding[field.characterSet] + '")';
     }
   }
 }