mysql2 2.3.0 → 2.3.3

package/lib/commands/command.js

@@ -1,6 +1,7 @@
 'use strict';
 
 const EventEmitter = require('events').EventEmitter;
+const Timers = require('timers');
 
 class Command extends EventEmitter {
   constructor() {
@@ -27,6 +28,10 @@ class Command extends EventEmitter {
     if (packet && packet.isError()) {
       const err = packet.asError(connection.clientEncoding);
       err.sql = this.sql || this.query;
+      if (this.queryTimeout) {
+        Timers.clearTimeout(this.queryTimeout);
+        this.queryTimeout = null;
+      }
       if (this.onResult) {
         this.onResult(err);
         this.emit('end');

package/lib/commands/execute.js

@@ -85,10 +85,10 @@ class Execute extends Command {
     if (!packet.isEOF()) {
       return connection.protocolError('Expected EOF packet');
     }
-    this._rowParser = this.buildParserFromFields(
+    this._rowParser = new (this.buildParserFromFields(
       this._fields[this._resultIndex],
       connection
-    );
+    ))();
     return Execute.prototype.row;
   }
 }

package/lib/commands/query.js

@@ -9,7 +9,6 @@ const Command = require('./command.js');
 const Packets = require('../packets/index.js');
 const getTextParser = require('../parsers/text_parser.js');
 const ServerStatus = require('../constants/server_status.js');
-const CharsetToEncoding = require('../constants/charset_encodings.js');
 
 const EmptyPacket = new Packets.Packet(0, Buffer.allocUnsafe(4), 0, 4);
 
@@ -44,7 +43,8 @@ class Query extends Command {
     throw new Error(err);
   }
 
-  start(packet, connection) {
+  /* eslint no-unused-vars: ["error", { "argsIgnorePattern": "^_" }] */
+  start(_packet, connection) {
     if (connection.config.debug) {
       // eslint-disable-next-line
       console.log('        Sending query command: %s', this.sql);
@@ -212,7 +212,7 @@ class Query extends Command {
     if (this._receivedFieldsCount === this._fieldCount) {
       const fields = this._fields[this._resultIndex];
       this.emit('fields', fields);
-      this._rowParser = getTextParser(fields, this.options, connection.config);
+      this._rowParser = new (getTextParser(fields, this.options, connection.config))(fields);
       return Query.prototype.fieldsEOF;
     }
     return Query.prototype.readField;
@@ -226,7 +226,8 @@ class Query extends Command {
     return this.row;
   }
 
-  row(packet) {
+  /* eslint no-unused-vars: ["error", { "argsIgnorePattern": "^_" }] */
+  row(packet, _connection) { 
     if (packet.isEOF()) {
       const status = packet.eofStatusFlags();
       const moreResults = status & ServerStatus.SERVER_MORE_RESULTS_EXISTS;
@@ -238,11 +239,10 @@ class Query extends Command {
     }
     let row;
     try {
-      row = new this._rowParser(
+      row = this._rowParser.next(
         packet,
         this._fields[this._resultIndex],
-        this.options,
-        CharsetToEncoding
+        this.options
       );
     } catch (err) {
       this._localStreamError = err;