Merge pull request #1390 from yuxizhe/feat-timeout-mock

fix(timeout): clear timeout after error occurs

Author: sidorares

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');

test/integration/connection/test-query-timeout.js

@@ -35,6 +35,12 @@ connection.execute({ sql: 'SELECT sleep(1) as a', timeout: 5000 }, (err, res) =>
   assert.deepEqual(res, [{ a: 0 }]);
 });
 
+connection.query({ sql: 'select 1 from non_existing_table', timeout: 500 }, (err, res) => {
+  assert.equal(res, null);
+  assert.ok(err);
+  assert.equal(err.code, 'ER_NO_SUCH_TABLE');
+});
+
 connection.execute('SELECT sleep(1) as a', (err, res) => {
   assert.deepEqual(res, [{ a: 0 }]);
   connection.end();