added possibility of using encoding while writing strings

Author: sushantdhiman

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;
 };

lib/packets/packet.js

@@ -729,7 +729,7 @@ Packet.prototype.writeNullTerminatedString = function (s) {
   this.writeInt8(0);
 };
 
-Packet.prototype.writeString = function (s) {
+Packet.prototype.writeString = function (s, encoding) {
   if (s === null) {
     this.writeInt8(0xfb);
 
@@ -744,7 +744,7 @@ Packet.prototype.writeString = function (s) {
   // this.buffer.write(s, this.offset, bytes, 'utf8');
   // this.offset += bytes;
 
-  var buf = StringParser.encode(s, 'cesu8');
+  var buf = StringParser.encode(s, encoding || 'cesu8');
   this.offset += buf.copy(this.buffer, this.offset);
 };
 

lib/packets/prepare_statement.js

@@ -3,20 +3,24 @@ var Packet = require('../packets/packet');
 var CommandCodes = require('../constants/commands');
 var StringParser = require('../parsers/string.js');
 
-function PrepareStatement (sql)
+function PrepareStatement (sql, charsetNumber)
 {
   this.query = sql;
+  this.charsetNumber = charsetNumber;
 }
 
 PrepareStatement.prototype.toPacket = function ()
 {
+  // TODO: use this.charsetNumber and get proper encoding type
   var buf = StringParser.encode(this.query, 'cesu8');
   var length = 5 + buf.length;
+
   var buffer = Buffer.allocUnsafe(length);
   var packet = new Packet(0, buffer, 0, length);
   packet.offset = 4;
   packet.writeInt8(CommandCodes.STMT_PREPARE);
-  packet.writeString(this.query);
+  // TODO: pass down encoding to this method too
+  packet.writeString(this.query, 'cesu8');
   return packet;
 };
 

lib/packets/query.js

@@ -11,13 +11,16 @@ function Query (sql, charsetNumber)
 
 Query.prototype.toPacket = function ()
 {
+  // TODO: use this.charsetNumber and get proper encoding type
   var buf = StringParser.encode(this.query, 'cesu8');
   var length = 5 + buf.length;
+
   var buffer = Buffer.allocUnsafe(length);
   var packet = new Packet(0, buffer, 0, length);
   packet.offset = 4;
   packet.writeInt8(CommandCode.QUERY);
-  packet.writeString(this.query);
+  // TODO: pass down encoding to this method too
+  packet.writeString(this.query, 'cesu8');
   return packet;
 };