feat(query): add timeout test

Author: yuxizhe

lib/commands/query.js

@@ -70,6 +70,11 @@ class Query extends Command {
 
   done() {
     this._unpipeStream();
+    // if all ready timeout, return null directly
+    if (this.timeout && !this.queryTimeout) {
+      return null;
+    }
+    // else clear timer
     if (this.queryTimeout) {
       Timers.clearTimeout(this.queryTimeout);
       this.queryTimeout = null;

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

@@ -0,0 +1,21 @@
+'use strict';
+
+const common = require('../../common');
+const connection = common.createConnection({ debug: false });
+const assert = require('assert');
+
+connection.query({ sql: 'SELECT sleep(3) as a', timeout: 500 }, (err, res) => {
+  assert.equal(res, null);
+  assert.ok(err);
+  assert.equal(err.code, 'PROTOCOL_SEQUENCE_TIMEOUT');
+  assert.equal(err.message, 'Query inactivity timeout');
+});
+
+connection.query({ sql: 'SELECT sleep(1) as a', timeout: 5000 }, (err, res) => {
+  assert.deepEqual(res, [{ a: 0 }]);
+});
+
+connection.query('SELECT sleep(1) as a', (err, res) => {
+  assert.deepEqual(res, [{ a: 0 }]);
+  connection.end();
+});