pass merged option - result of local and global options

Author: sidorares

lib/commands/execute.js

@@ -22,7 +22,7 @@ function Execute (options, callback)
   this._result = [];
   this._fieldCount = 0;
   this._rowParser = null;
-  this.options = options;
+  this._executeOptions = options;
   this._resultIndex = 0;
   this._localStream = null;
   this._streamFactory = options.infileStreamFactory;
@@ -40,6 +40,7 @@ Execute.prototype.buildParserFromFields = function (fields, connection) {
 };
 
 Execute.prototype.start = function (packet, connection) {
+  this.options = Object.assign({}, connection.config, this._executeOptions);
   var executePacket = new Packets.Execute(this.statement.id, this.parameters, connection.config.charsetNumber);
   connection.writePacket(executePacket.toPacket(1));
   return Execute.prototype.resultsetHeader;

lib/commands/query.js

@@ -8,6 +8,7 @@ var Command = require('./command.js');
 var Packets = require('../packets/index.js');
 var compileParser = require('../compile_text_parser.js');
 var ServerStatus = require('../constants/server_status.js');
+var CharsetToEncoding = require('../constants/charset_encodings.js');
 
 var EmptyPacket = new Packets.Packet(0, Buffer.allocUnsafe(4), 0, 4);
 
@@ -16,7 +17,7 @@ function Query (options, callback)
   Command.call(this);
   this.sql = options.sql;
   this.values = options.values;
-  this.options = options;
+  this._queryOptions = options;
   this.onResult = callback;
   this._fieldCount = 0;
   this._rowParser = null;
@@ -35,6 +36,7 @@ Query.prototype.start = function (packet, connection) {
     console.log('        Sending query command: %s', this.sql);
   }
   this._connection = connection;
+  this.options = Object.assign({}, connection.config, this._queryOptions);
   var cmdPacket = new Packets.Query(this.sql, connection.config.charsetNumber);
   connection.writePacket(cmdPacket.toPacket(1));
   return Query.prototype.resultsetHeader;
@@ -168,7 +170,7 @@ Query.prototype.readField = function (packet, connection) {
     this._rowParser = connection.textProtocolParsers[parserKey];
     if (!this._rowParser) {
       this._rowParser = compileParser(fields, this.options, connection.config);
-      connection.textProtocolParsers[parserKey] = this.rowParser;
+      connection.textProtocolParsers[parserKey] = this._rowParser;
     }
     return Query.prototype.fieldsEOF;
   }
@@ -195,7 +197,8 @@ Query.prototype.row = function (packet)
     return this.done();
   }
 
-  var row = new this._rowParser(packet, this._fields[this._resultIndex], this.options);
+  debugger;
+  var row = new this._rowParser(packet, this._fields[this._resultIndex], this.options, CharsetToEncoding);
   if (this.onResult) {
     this._rows[this._resultIndex].push(row);
   } else {