WIP: pass encoding to writers and readers

Author: Andrey Sidorov

lib/commands/query.js

@@ -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/compile_binary_parser.js

@@ -99,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:

lib/compile_text_parser.js

@@ -14,18 +14,18 @@ function compile (fields, options, config) {
 
   // node-mysql typeCast compatibility wrapper
   // see https://github.com/mysqljs/mysql/blob/96fdd0566b654436624e2375c7b6604b1f50f825/lib/protocol/packets/Field.js
-  function wrap (field, type, packet) {
+  function wrap (field, type, packet, encoding) {
     return {
       type: type,
       length: field.columnLength,
       db: field.schema,
       table: field.table,
       name: field.name,
-      string: function () { return packet.readLengthCodedString(); },
+      string: function () { return packet.readLengthCodedString(encoding); },
       buffer: function () { return packet.readLengthCodedBuffer(); },
       geometry: function () { return packet.parseGeometryValue(); }
     };
-  };
+  }
 
   var result = [];
   var i = 0;
@@ -74,9 +74,10 @@ function compile (fields, options, config) {
     } else {
       lvalue = '  this[' + srcEscape(fields[i].name) + ']';
     }
-    var readCode = readCodeFor(fields[i].columnType, fields[i].characterSet, config, options);
+    var encoding = CharsetToEncoding[fields[i].characterSet];
+    var readCode = readCodeFor(fields[i].columnType, fields[i].characterSet, encoding, config, options);
     if (typeof options.typeCast === 'function') {
-      result.push(lvalue + ' = options.typeCast(wrap(fields[' + i + '], ' + srcEscape(typeNames[fields[i].columnType]) + ', packet), function() { return ' + readCode + ';})');
+      result.push(lvalue + ' = options.typeCast(wrap(fields[' + i + '], ' + srcEscape(typeNames[fields[i].columnType]) + ', packet, "' + encoding + '"), function() { return ' + readCode + ';})');
     } else if (options.typeCast === false) {
       result.push(lvalue + ' = packet.readLengthCodedBuffer();');
     } else {
@@ -99,7 +100,7 @@ function compile (fields, options, config) {
   return vm.runInThisContext(src);
 }
 
-function readCodeFor (type, charset, config, options) {
+function readCodeFor (type, charset, encoding, config, options) {
   var supportBigNumbers = options.supportBigNumbers || config.supportBigNumbers;
   var bigNumberStrings = options.bigNumberStrings || config.bigNumberStrings;
 
@@ -142,12 +143,12 @@ function readCodeFor (type, charset, config, options) {
   case Types.GEOMETRY:
     return 'packet.parseGeometryValue()';
   case Types.JSON:
-    return 'JSON.parse(packet.readLengthCodedString("' + CharsetToEncoding[charset] + '"))';
+    return 'JSON.parse(packet.readLengthCodedString("' + encoding + '"))';
   default:
     if (charset == Charsets.BINARY) {
       return 'packet.readLengthCodedBuffer()';
     } else {
-      return 'packet.readLengthCodedString("' + CharsetToEncoding[charset] + '")';
+      return 'packet.readLengthCodedString("' + encoding + '")';
     }
   }
 }

lib/connection.js

@@ -177,6 +177,7 @@ Connection.prototype.writePacket = function (packet) {
   packet.writeHeader(this.sequenceId);
   if (this.config.debug) {
     console.log(this._internalId + ' ' + this.connectionId + ' <== ' + this._command._commandName + '#' + this._command.stateName() + '(' + [this.sequenceId, packet._name, packet.length()].join(',') + ')');
+    console.log(this._internalId + ' ' + this.connectionId + ' <== ' + packet.buffer.toString('hex'));
   }
   this.sequenceId++;
   if (this.sequenceId == 256) {
@@ -661,7 +662,7 @@ Connection.prototype.writeColumns = function (columns) {
   var connection = this;
   this.writePacket(Packets.ResultSetHeader.toPacket(columns.length));
   columns.forEach(function (column) {
-    connection.writePacket(Packets.ColumnDefinition.toPacket(column, this.serverConfig.encoding));
+    connection.writePacket(Packets.ColumnDefinition.toPacket(column, connection.serverConfig.encoding));
   });
   this.writeEof();
 };
@@ -696,6 +697,8 @@ Connection.prototype.writeOk = function (args) {
 };
 
 Connection.prototype.writeError = function (args) {
+  // if we want to send error before initial hello was sent, use default encoding
+  var encoding = this.serverConfig ? this.serverConfig.encoding : 'cesu8';
   this.writePacket(Packets.Error.toPacket(args, this.serverConfig.encoding));
 };
 

lib/packets/packet.js

@@ -760,8 +760,8 @@ Packet.prototype.writeLengthCodedString = function (s, encoding) {
 
 Packet.prototype.writeLengthCodedBuffer = function (b) {
   this.writeLengthCodedNumber(b.length);
-  this.offset += b.length;
   b.copy(this.buffer, this.offset);
+  this.offset += b.length;
 };
 
 Packet.prototype.writeLengthCodedNumber = function (n) {

lib/packets/resultset_header.js

@@ -3,7 +3,7 @@
 var Buffer = require('safe-buffer').Buffer;
 var Packet = require('../packets/packet');
 
-function ResultSetHeader (packet, bigNumberStrings)
+function ResultSetHeader (packet, bigNumberStrings, encoding)
 {
   if (packet.buffer[packet.offset] !== 0) {
     this.fieldCount = packet.readLengthCodedNumber();
@@ -15,7 +15,7 @@ function ResultSetHeader (packet, bigNumberStrings)
     this.warningStatus = packet.readInt16();
   }
   if (this.fieldCount === null) {
-    this.infileName = packet.readString();
+    this.infileName = packet.readString(undefined, encoding);
   }
 
   // snippet from mysql-native: