WIP: pass encoding to writers and readers

Author: Andrey Sidorov

lib/commands/server_handshake.js

@@ -99,7 +99,7 @@ ServerHandshake.prototype.dispatchCommands = function (packet, connection) {
 
   case CommandCode.QUERY:
     if (connection.listeners('query').length) {
-      var query = packet.readString(encoding);
+      var query = packet.readString(undefined, encoding);
       connection.emit('query', query);
     } else {
       connection.writeError({

lib/compile_text_parser.js

@@ -125,24 +125,24 @@ function readCodeFor (type, charset, config, options) {
     if (config.decimalNumbers) {
       return 'packet.parseLengthCodedFloat()';
     }
-    return 'packet.readLengthCodedString()';
+    return 'packet.readLengthCodedString("ascii")';
   case Types.DATE:
     if (config.dateStrings) {
-      return 'packet.readLengthCodedString()';
+      return 'packet.readLengthCodedString("ascii")';
     }
     return 'packet.parseDate()';
   case Types.DATETIME:
   case Types.TIMESTAMP:
     if (config.dateStrings) {
-      return 'packet.readLengthCodedString()';
+      return 'packet.readLengthCodedString("ascii")';
     }
     return 'packet.parseDateTime()';
   case Types.TIME:
-    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[charset] + '"))';
   default:
     if (charset == Charsets.BINARY) {
       return 'packet.readLengthCodedBuffer()';

lib/connection.js

@@ -77,7 +77,7 @@ function Connection (opts)
 
   this._outOfOrderPackets = [];
 
-  this.stream.once('error', function(err) {
+  this.stream.once('error', function (err) {
     connection._handleNetworkError(err);
   });
 
@@ -109,15 +109,15 @@ function Connection (opts)
       connection.threadId = handshakeCommand.handshake.connectionId;
       connection.emit('connect', handshakeCommand.handshake);
     });
-    handshakeCommand.on('error', function(err) {
+    handshakeCommand.on('error', function (err) {
       connection._notifyError(err);
     });
     this.addCommand(handshakeCommand);
   }
 }
 util.inherits(Connection, EventEmitter);
 
-Connection.prototype._handleNetworkError = function(err) {
+Connection.prototype._handleNetworkError = function (err) {
   var connection = this;
   err.fatal = true;
   // stop receiving packets
@@ -202,24 +202,24 @@ if (tls.TLSSocket) {
     });
 
     var rejectUnauthorized = this.config.ssl.rejectUnauthorized;
-    var secureEstablished  = false;
-    var secureSocket       = new tls.TLSSocket(connection.stream, {
+    var secureEstablished = false;
+    var secureSocket = new tls.TLSSocket(connection.stream, {
       rejectUnauthorized : rejectUnauthorized,
       requestCert        : true,
       secureContext      : secureContext,
       isServer           : false
     });
 
     // error handler for secure socket
-    secureSocket.on('_tlsError', function(err) {
+    secureSocket.on('_tlsError', function (err) {
       if (secureEstablished) {
         connection._handleNetworkError(err);
       } else {
         onSecure(err);
       }
     });
 
-    secureSocket.on('secure', function() {
+    secureSocket.on('secure', function () {
       secureEstablished = true;
       onSecure(rejectUnauthorized ? this.ssl.verifyError() : null);
     });
@@ -440,7 +440,7 @@ Connection.prototype.resume = function resume () {
 };
 
 Connection.prototype.keyFromFields = function keyFromFields (fields, options) {
-  var res = (typeof options.nestTables) + '/' + options.nestTables + '/' + options.rowsAsArray +
+  var res = (typeof options.nestTables) + '/' + options.nestTables + '/' + options.rowsAsArray
     + options.supportBigNumbers + '/' + options.bigNumberStrings;
   for (var i = 0; i < fields.length; ++i) {
     res += '/' + fields[i].name + ':' + fields[i].columnType + ':' + fields[i].flags;

lib/packets/handshake_response.js

@@ -42,6 +42,7 @@ HandshakeResponse.fromPacket = function (packet)
   args.maxPacketSize = packet.readInt32();
   args.charsetNumber = packet.readInt8();
   var encoding = CharsetToEncoding[args.charsetNumber];
+  args.encoding = encoding;
   packet.skip(23);
   args.user = packet.readNullTerminatedString(encoding);
   var authTokenLength;

lib/packets/text_row.js

@@ -16,22 +16,22 @@ TextRow.fromPacket = function (packet) {
   return new TextRow(columns);
 };
 
-TextRow.toPacket = function (column) {
+TextRow.toPacket = function (columns, encoding) {
   var sequenceId = 0; // TODO remove, this is calculated now in connecton
   var buffer, packet;
   var length = 0;
-  column.forEach(function (val) {
+  columns.forEach(function (val) {
     if (val === null || typeof (val) == 'undefined') {
       ++length;
       return;
     }
-    length += Packet.lengthCodedStringLength(val.toString(10), CharsetToEncoding[column.characterSet]);
+    length += Packet.lengthCodedStringLength(val.toString(10), encoding);
   });
 
   buffer = Buffer.allocUnsafe(length + 4);
   packet = new Packet(sequenceId, buffer, 0, length + 4);
   packet.offset = 4;
-  column.forEach(function (val) {
+  columns.forEach(function (val) {
     if (val === null) {
       packet.writeNull();
       return;
@@ -40,7 +40,7 @@ TextRow.toPacket = function (column) {
       packet.writeInt8(0);
       return;
     }
-    packet.writeLengthCodedString(val.toString(10), CharsetToEncoding[column.characterSet]);
+    packet.writeLengthCodedString(val.toString(10), encoding);
   });
   return packet;
 };

test/unit/packets/test-text-row.js

@@ -2,15 +2,15 @@ var assert = require('assert');
 var TextRow = require('../../../lib/packets/text_row.js');
 
 // simple
-var packet = TextRow.toPacket(['Hello', 'World']);
+var packet = TextRow.toPacket(['Hello', 'World'], 'cesu8');
 assert.equal(packet.buffer.toString('hex', 4), '0548656c6c6f05576f726c64');
 
 // Russian (unicode)
-var packet = TextRow.toPacket(['Ну,', 'погоди!']);
+var packet = TextRow.toPacket(['Ну,', 'погоди!'], 'cesu8');
 assert.equal(packet.buffer.toString('hex', 4), '05d09dd1832c0dd0bfd0bed0b3d0bed0b4d0b821');
 
 // Long > 256 byte
-var packet = TextRow.toPacket(['Пушкин родился 26 мая (6 июня) 1799 г. в Москве. В метрической книге церкви Богоявления в Елохове (сейчас на её месте находится Богоявленский собор в Елохове) на дату 8 июня 1799 г.']);
+var packet = TextRow.toPacket(['Пушкин родился 26 мая (6 июня) 1799 г. в Москве. В метрической книге церкви Богоявления в Елохове (сейчас на её месте находится Богоявленский собор в Елохове) на дату 8 июня 1799 г.'], 'cesu8');
 assert.equal(
   packet.buffer.toString('hex', 4),
   'fc3801d09fd183d188d0bad0b8d0bd20d180d0bed0b4d0b8d0bbd181d18f20323620d0bcd0b0d18f20283620d0b8d18ed0bdd18f29203137393920d0b32e20d0b220d09cd0bed181d0bad0b2d0b52e20d09220d0bcd0b5d182d180d0b8d187d0b5d181d0bad0bed0b920d0bad0bdd0b8d0b3d0b520d186d0b5d180d0bad0b2d0b820d091d0bed0b3d0bed18fd0b2d0bbd0b5d0bdd0b8d18f20d0b220d095d0bbd0bed185d0bed0b2d0b52028d181d0b5d0b9d187d0b0d18120d0bdd0b020d0b5d19120d0bcd0b5d181d182d0b520d0bdd0b0d185d0bed0b4d0b8d182d181d18f20d091d0bed0b3d0bed18fd0b2d0bbd0b5d0bdd181d0bad0b8d0b920d181d0bed0b1d0bed18020d0b220d095d0bbd0bed185d0bed0b2d0b52920d0bdd0b020d0b4d0b0d182d183203820d0b8d18ed0bdd18f203137393920d0b32e'