mysql2 3.9.0 → 3.9.2

package/lib/commands/query.js

@@ -30,7 +30,7 @@ class Query extends Command {
     this._receivedFieldsCount = 0;
     this._resultIndex = 0;
     this._localStream = null;
-    this._unpipeStream = function() {};
+    this._unpipeStream = function () { };
     this._streamFactory = options.infileStreamFactory;
     this._connection = null;
   }
@@ -155,7 +155,7 @@ class Query extends Command {
     const onPause = () => {
       this._localStream.pause();
     };
-    const onData = function(data) {
+    const onData = function (data) {
       const dataWithHeader = Buffer.allocUnsafe(data.length + 4);
       data.copy(dataWithHeader, 4);
       connection.writePacket(
@@ -227,7 +227,7 @@ class Query extends Command {
   }
 
   /* eslint no-unused-vars: ["error", { "argsIgnorePattern": "^_" }] */
-  row(packet, _connection) { 
+  row(packet, _connection) {
     if (packet.isEOF()) {
       const status = packet.eofStatusFlags();
       const moreResults = status & ServerStatus.SERVER_MORE_RESULTS_EXISTS;
@@ -279,11 +279,13 @@ class Query extends Command {
     });
     this.on('end', () => {
       stream.push(null); // pushing null, indicating EOF
-      setImmediate(() => stream.emit('close')); // notify readers that query has completed
     });
     this.on('fields', fields => {
       stream.emit('fields', fields); // replicate old emitter
     });
+    stream.on('end', () => {
+      stream.emit('close');
+    });
     return stream;
   }
 
@@ -302,7 +304,7 @@ class Query extends Command {
       Timers.clearTimeout(this.queryTimeout);
       this.queryTimeout = null;
     }
-    
+
     const err = new Error('Query inactivity timeout');
     err.errorno = 'PROTOCOL_SEQUENCE_TIMEOUT';
     err.code = 'PROTOCOL_SEQUENCE_TIMEOUT';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mysql2",
-  "version": "3.9.0",
+  "version": "3.9.2",
   "description": "fast mysql driver. Implements core protocol, prepared statements, ssl and compression in native JS",
   "main": "index.js",
   "typings": "typings/mysql/index",
@@ -82,7 +82,6 @@
     "prettier": "^3.0.0",
     "progress": "^2.0.3",
     "typescript": "^5.0.2",
-    "urun": "0.0.8",
     "utest": "0.0.8"
   }
 }

package/typings/mysql/lib/parsers/index.d.ts

@@ -1,3 +1,18 @@
 import { setMaxParserCache, clearParserCache } from './ParserCache.js';
+import {
+  TypeCast,
+  Field as TypeCastField,
+  Geometry as TypeCastGeometry,
+  Next as TypeCastNext,
+  Type as TypeCastType,
+} from './typeCast.js';
 
-export { setMaxParserCache, clearParserCache };
+export {
+  setMaxParserCache,
+  clearParserCache,
+  TypeCast,
+  TypeCastField,
+  TypeCastGeometry,
+  TypeCastNext,
+  TypeCastType,
+};

package/typings/mysql/lib/parsers/typeCast.d.ts

@@ -1,9 +1,9 @@
-type Geometry = {
+export type Geometry = {
   x: number;
   y: number;
 };
 
-type Type = {
+export type Type = {
   type:
     | 'DECIMAL'
     | 'TINY'
@@ -38,16 +38,16 @@ type Type = {
     | 'GEOMETRY';
 };
 
-type Field = Type & {
+export type Field = Type & {
   length: number;
   db: string;
   table: string;
   name: string;
-  string: () => string | null;
+  string: (encoding?: BufferEncoding | string | undefined) => string | null;
   buffer: () => Buffer | null;
   geometry: () => Geometry | Geometry[] | null;
 };
 
-type Next = () => void;
+export type Next = () => void;
 
 export type TypeCast = ((field: Field, next: Next) => any) | boolean;

package/typings/mysql/lib/protocol/packets/Field.d.ts

@@ -1,15 +1,10 @@
-declare interface Field {
-  constructor: {
-    name: 'Field';
-  };
-  db: string;
-  table: string;
-  name: string;
-  type: string;
-  length: number;
-  string: () => any;
-  buffer: () => any;
-  geometry: () => any;
-}
+// TODO (major version): remove workaround for `Field` compatibility.
+import { TypeCastField } from '../../../lib/parsers/index.js';
+
+/**
+ * @deprecated
+ * `Field` is deprecated and might be removed in the future major release. Please use `TypeCastField` type instead.
+ */
+declare interface Field extends TypeCastField {}
 
 export { Field };