added possibility of using encoding when reading strings

Author: sushantdhiman

lib/compile_text_parser.js

@@ -146,7 +146,7 @@ function readCodeFor (type, charset, config, options) {
     if (charset == Charsets.BINARY) {
       return 'packet.readLengthCodedBuffer()';
     } else {
-      return 'packet.readLengthCodedString()';
+      return 'packet.readLengthCodedString(' + charset + ')';
     }
   }
 }

lib/packets/column_definition.js

@@ -1,5 +1,6 @@
 var Buffer = require('safe-buffer').Buffer;
 var Packet = require('../packets/packet');
+var StringParser = require('../parsers/string');
 
 // creating JS string is relatively expensive (compared to
 // reading few bytes from buffer) because all string properties
@@ -34,14 +35,22 @@ function ColumnDefinition (packet)
   packet.offset += this._orgTableLength;
 
   // name is always used, don't make it lazy
-  this.name = packet.readLengthCodedString();
+  var _nameLength = packet.readLengthCodedNumber();
+  var _nameStart = packet.offset;
+  packet.offset += _nameLength;
 
   this._orgNameLength = packet.readLengthCodedNumber();
   this._orgNameStart = packet.offset;
   packet.offset += this._orgNameLength;
 
   packet.skip(1); //  length of the following fields (always 0x0c)
   this.characterSet = packet.readInt16();
+
+  // TODO: use this.characterSet to get proper encoding
+  // May be keep it cesu8 since MySQL meta data is actually cesu8
+  // https://github.com/sidorares/node-mysql2/pull/374
+  this.name = StringParser.decode(this._buf.slice(_nameStart, _nameStart + _nameLength), 'cesu8');
+
   this.columnLength = packet.readInt32();
   this.columnType = packet.readInt8();
   this.flags = packet.readInt16();

lib/packets/packet.js

@@ -342,15 +342,15 @@ Packet.prototype.readTimeString = function (convertTtoMs) {
   return (sign === -1 ? '-' : '') + [(d ? (d * 24) + H : H), leftPad(2, M), leftPad(2, S)].join(':') + (ms ? '.' + ms : '');
 };
 
-Packet.prototype.readLengthCodedString = function () {
+Packet.prototype.readLengthCodedString = function (characterSetCode) {
   var len = this.readLengthCodedNumber();
   // TODO: check manually first byte here to avoid polymorphic return type?
   if (len === null) {
     return null;
   }
   this.offset += len;
 
-  // because MySQL utf8 is actually cesu8
+  // TODO: Use characterSetCode to get proper encoding
   // https://github.com/sidorares/node-mysql2/pull/374
   return StringParser.decode(this.buffer.slice(this.offset - len, this.offset), 'cesu8');
 };