mysql2 3.14.3 → 3.14.4-canary.64ea4cdd

package/lib/base/connection.js

@@ -392,7 +392,7 @@ class BaseConnection extends EventEmitter {
     secureSocket.on('data', (data) => {
       this.packetParser.execute(data);
     });
-    this.write = (buffer) => secureSocket.write(buffer);
+    this.stream = secureSocket;
   }
 
   protocolError(message, code) {

package/lib/commands/query.js

@@ -271,30 +271,67 @@ class Query extends Command {
   }
 
   stream(options) {
-    options = options || {};
+    options = options || Object.create(null);
     options.objectMode = true;
-    const stream = new Readable(options);
-    stream._read = () => {
-      this._connection && this._connection.resume();
-    };
-    this.on('result', (row, resultSetIndex) => {
-      if (!stream.push(row)) {
-        this._connection.pause();
-      }
-      stream.emit('result', row, resultSetIndex); // replicate old emitter
-    });
-    this.on('error', (err) => {
-      stream.emit('error', err); // Pass on any errors
+
+    const stream = new Readable({
+      ...options,
+      emitClose: true,
+      autoDestroy: true,
+      read: () => {
+        this._connection && this._connection.resume();
+      },
     });
-    this.on('end', () => {
-      stream.push(null); // pushing null, indicating EOF
+
+    // Prevent a breaking change for users that rely on `end` event
+    stream.once('close', () => {
+      if (!stream.readableEnded) {
+        stream.emit('end');
+      }
     });
-    this.on('fields', (fields) => {
+
+    const onResult = (row, index) => {
+      if (stream.destroyed) return;
+
+      if (!stream.push(row)) {
+        this._connection && this._connection.pause();
+      }
+
+      stream.emit('result', row, index); // replicate old emitter
+    };
+
+    const onFields = (fields) => {
+      if (stream.destroyed) return;
+
       stream.emit('fields', fields); // replicate old emitter
-    });
-    stream.on('end', () => {
-      stream.emit('close');
-    });
+    };
+
+    const onEnd = () => {
+      if (stream.destroyed) return;
+
+      stream.push(null); // pushing null, indicating EOF
+    };
+
+    const onError = (err) => {
+      stream.destroy(err);
+    };
+
+    stream._destroy = (err, cb) => {
+      this._connection && this._connection.resume();
+
+      this.removeListener('result', onResult);
+      this.removeListener('fields', onFields);
+      this.removeListener('end', onEnd);
+      this.removeListener('error', onError);
+
+      cb(err); // Pass on any errors
+    };
+
+    this.on('result', onResult);
+    this.on('fields', onFields);
+    this.on('end', onEnd);
+    this.on('error', onError);
+
     return stream;
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mysql2",
-  "version": "3.14.3",
+  "version": "3.14.4-canary.64ea4cdd",
   "description": "fast mysql driver. Implements core protocol, prepared statements, ssl and compression in native JS",
   "main": "index.js",
   "typings": "typings/mysql/index",
@@ -49,7 +49,7 @@
     "aws-ssl-profiles": "^1.1.1",
     "denque": "^2.1.0",
     "generate-function": "^2.3.1",
-    "iconv-lite": "^0.6.3",
+    "iconv-lite": "^0.7.0",
     "long": "^5.2.1",
     "lru.min": "^1.0.0",
     "named-placeholders": "^1.1.3",