fix(timeout): execute add timeout option

Author: yuxizhe

lib/commands/execute.js

@@ -15,6 +15,8 @@ class Execute extends Command {
     this.onResult = callback;
     this.parameters = options.values;
     this.insertId = 0;
+    this.timeout = options.timeout;
+    this.queryTimeout = null;
     this._rows = [];
     this._fields = [];
     this._result = [];
@@ -35,6 +37,7 @@ class Execute extends Command {
   start(packet, connection) {
     this._connection = connection;
     this.options = Object.assign({}, connection.config, this._executeOptions);
+    this._setTimeout();
     const executePacket = new Packets.Execute(
       this.statement.id,
       this.parameters,
@@ -96,6 +99,8 @@ Execute.prototype.resultsetHeader = Query.prototype.resultsetHeader;
 Execute.prototype._findOrCreateReadStream =
   Query.prototype._findOrCreateReadStream;
 Execute.prototype._streamLocalInfile = Query.prototype._streamLocalInfile;
+Execute.prototype._setTimeout = Query.prototype._setTimeout;
+Execute.prototype._handleTimeoutError = Query.prototype._handleTimeoutError;
 Execute.prototype.row = Query.prototype.row;
 Execute.prototype.stream = Query.prototype.stream;
 

lib/commands/query.js

@@ -51,14 +51,7 @@ class Query extends Command {
     }
     this._connection = connection;
     this.options = Object.assign({}, connection.config, this._queryOptions);
-
-    if (this.timeout) {
-      const timeoutHandler = this._handleTimeoutError.bind(this);
-      this.queryTimeout = Timers.setTimeout(
-        timeoutHandler,
-        this.timeout
-      );
-    }
+    this._setTimeout();
 
     const cmdPacket = new Packets.Query(
       this.sql,
@@ -294,6 +287,16 @@ class Query extends Command {
     return stream;
   }
 
+  _setTimeout() {
+    if (this.timeout) {
+      const timeoutHandler = this._handleTimeoutError.bind(this);
+      this.queryTimeout = Timers.setTimeout(
+        timeoutHandler,
+        this.timeout
+      );
+    }
+  }
+
   _handleTimeoutError() {
     if (this.queryTimeout) {
       Timers.clearTimeout(this.queryTimeout);

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

@@ -17,5 +17,20 @@ connection.query({ sql: 'SELECT sleep(1) as a', timeout: 5000 }, (err, res) => {
 
 connection.query('SELECT sleep(1) as a', (err, res) => {
   assert.deepEqual(res, [{ a: 0 }]);
+});
+
+connection.execute({ 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.execute({ sql: 'SELECT sleep(1) as a', timeout: 5000 }, (err, res) => {
+  assert.deepEqual(res, [{ a: 0 }]);
+});
+
+connection.execute('SELECT sleep(1) as a', (err, res) => {
+  assert.deepEqual(res, [{ a: 0 }]);
   connection.end();
 });