mysql2 3.4.3 → 3.4.5

package/README.md

@@ -1,4 +1,4 @@
-## Node MySQL 2
+## MySQL 2
 
 [![Greenkeeper badge](https://badges.greenkeeper.io/sidorares/node-mysql2.svg)](https://greenkeeper.io/)
 [![NPM Version][npm-image]][npm-url]

package/lib/commands/prepare.js

@@ -73,10 +73,19 @@ class Prepare extends Command {
       return Prepare.prototype.readField;
     } 
     return this.prepareDone(connection);
-    
   }
 
   readParameter(packet, connection) {
+    // there might be scenarios when mysql server reports more parameters than
+    // are actually present in the array of parameter definitions.
+    // if EOF packet is received we switch to "read fields" state if there are
+    // any fields reported by the server, otherwise we finish the command.
+    if (packet.isEOF()) {
+      if (this.fieldCount > 0) {
+        return Prepare.prototype.readField;
+      }
+      return this.prepareDone(connection);
+    }
     const def = new Packets.ColumnDefinition(packet, connection.clientEncoding);
     this.parameterDefinitions.push(def);
     if (this.parameterDefinitions.length === this.parameterCount) {
@@ -86,6 +95,9 @@ class Prepare extends Command {
   }
 
   readField(packet, connection) {
+    if (packet.isEOF()) {
+      return this.prepareDone(connection);
+    }
     const def = new Packets.ColumnDefinition(packet, connection.clientEncoding);
     this.fields.push(def);
     if (this.fields.length === this.fieldCount) {

package/lib/connection.js

@@ -489,14 +489,23 @@ class Connection extends EventEmitter {
       }
       this._bumpSequenceId(packet.numPackets);
     }
-    const done = this._command.execute(packet, this);
-    if (done) {
-      this._command = this._commands.shift();
-      if (this._command) {
-        this.sequenceId = 0;
-        this.compressedSequenceId = 0;
-        this.handlePacket();
+    try {
+      if (this._fatalError) {
+        // skip remaining packets after client is in the error state
+        return;
+      }
+      const done = this._command.execute(packet, this);
+      if (done) {
+        this._command = this._commands.shift();
+        if (this._command) {
+          this.sequenceId = 0;
+          this.compressedSequenceId = 0;
+          this.handlePacket();
+        }
       }
+    } catch (err) {
+      this._handleFatalError(err);
+      this.stream.destroy();
     }
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mysql2",
-  "version": "3.4.3",
+  "version": "3.4.5",
   "description": "fast mysql driver. Implements core protocol, prepared statements, ssl and compression in native JS",
   "main": "index.js",
   "directories": {
@@ -12,6 +12,7 @@
     "lint:code": "eslint index.js promise.js index.d.ts promise.d.ts \"typings/**/*.ts\" \"lib/**/*.js\" \"test/**/*.{js,ts}\" \"benchmarks/**/*.js\"",
     "lint:docs": "eslint Contributing.md README.md \"documentation/**/*.md\" \"examples/*.js\"",
     "test": "node ./test/run.js",
+    "test:builtin-node-runner": "NODE_V8_COVERAGE=./coverage node --test --experimental-test-coverage test/builtin-runner",
     "test:tsc-build": "cd \"test/tsc-build\" && npx tsc -p \"tsconfig.json\"",
     "coverage-test": "c8 -r cobertura -r lcov -r text node ./test/run.js",
     "benchmark": "node ./benchmarks/benchmark.js",

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

@@ -0,0 +1,18 @@
+import { OkPacket } from './OkPacket.js';
+import { ResultSetHeader } from './ResultSetHeader.js';
+import { RowDataPacket } from './RowDataPacket.js';
+
+declare type ProcedureCallPacket<
+  T = RowDataPacket[] | RowDataPacket[][] | ResultSetHeader
+> = T extends RowDataPacket[]
+  ? [...T, ResultSetHeader]
+  : T extends RowDataPacket[][]
+  ? [...T, ResultSetHeader]
+  : T extends ResultSetHeader | OkPacket | OkPacket[]
+  ? ResultSetHeader
+  :
+      | [...RowDataPacket[], ResultSetHeader]
+      | [...RowDataPacket[][], ResultSetHeader]
+      | ResultSetHeader;
+
+export { ProcedureCallPacket };

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

@@ -2,6 +2,7 @@ import { OkPacket } from './OkPacket.js';
 import { RowDataPacket } from './RowDataPacket.js';
 import { FieldPacket } from './FieldPacket.js';
 import { Field } from './Field.js';
+import { ProcedureCallPacket } from './ProcedurePacket.js';
 import { ResultSetHeader } from './ResultSetHeader.js';
 import { OkPacketParams } from './params/OkPacketParams.js';
 import { ErrorPacketParams } from './params/ErrorPacketParams.js';
@@ -11,6 +12,7 @@ export {
   RowDataPacket,
   FieldPacket,
   Field,
+  ProcedureCallPacket,
   ResultSetHeader,
   OkPacketParams,
   ErrorPacketParams,

package/typings/mysql/lib/protocol/sequences/ExecutableBase.d.ts

@@ -3,6 +3,7 @@ import {
   FieldPacket,
   RowDataPacket,
   ResultSetHeader,
+  ProcedureCallPacket,
 } from '../packets/index.js';
 import {
   Query,
@@ -10,6 +11,7 @@ import {
   QueryOptions,
   QueryableConstructor,
 } from './Query.js';
+
 export declare function ExecutableBase<T extends QueryableConstructor>(
   Base?: T
 ): {
@@ -21,6 +23,7 @@ export declare function ExecutableBase<T extends QueryableConstructor>(
         | RowDataPacket[]
         | RowDataPacket[][]
         | OkPacket[]
+        | ProcedureCallPacket
     >(
       sql: string,
       callback?:
@@ -28,44 +31,47 @@ export declare function ExecutableBase<T extends QueryableConstructor>(
         | undefined
     ): Query;
     execute<
-      T_1 extends
+      T extends
         | OkPacket
         | ResultSetHeader
         | RowDataPacket[]
         | RowDataPacket[][]
         | OkPacket[]
+        | ProcedureCallPacket
     >(
       sql: string,
       values: any,
       callback?:
-        | ((err: QueryError | null, result: T_1, fields: FieldPacket[]) => any)
+        | ((err: QueryError | null, result: T, fields: FieldPacket[]) => any)
         | undefined
     ): Query;
     execute<
-      T_2 extends
+      T extends
         | OkPacket
         | ResultSetHeader
         | RowDataPacket[]
         | RowDataPacket[][]
         | OkPacket[]
+        | ProcedureCallPacket
     >(
       options: QueryOptions,
       callback?:
-        | ((err: QueryError | null, result: T_2, fields?: FieldPacket[]) => any)
+        | ((err: QueryError | null, result: T, fields?: FieldPacket[]) => any)
         | undefined
     ): Query;
     execute<
-      T_3 extends
+      T extends
         | OkPacket
         | ResultSetHeader
         | RowDataPacket[]
         | RowDataPacket[][]
         | OkPacket[]
+        | ProcedureCallPacket
     >(
       options: QueryOptions,
       values: any,
       callback?:
-        | ((err: QueryError | null, result: T_3, fields: FieldPacket[]) => any)
+        | ((err: QueryError | null, result: T, fields: FieldPacket[]) => any)
         | undefined
     ): Query;
   };

package/typings/mysql/lib/protocol/sequences/QueryableBase.d.ts

@@ -3,6 +3,7 @@ import {
   FieldPacket,
   RowDataPacket,
   ResultSetHeader,
+  ProcedureCallPacket,
 } from '../packets/index.js';
 import {
   Query,
@@ -10,6 +11,7 @@ import {
   QueryOptions,
   QueryableConstructor,
 } from './Query.js';
+
 export declare function QueryableBase<T extends QueryableConstructor>(
   Base?: T
 ): {
@@ -21,6 +23,7 @@ export declare function QueryableBase<T extends QueryableConstructor>(
         | RowDataPacket[]
         | RowDataPacket[][]
         | OkPacket[]
+        | ProcedureCallPacket
     >(
       sql: string,
       callback?:
@@ -28,44 +31,47 @@ export declare function QueryableBase<T extends QueryableConstructor>(
         | undefined
     ): Query;
     query<
-      T_1 extends
+      T extends
         | OkPacket
         | ResultSetHeader
         | RowDataPacket[]
         | RowDataPacket[][]
         | OkPacket[]
+        | ProcedureCallPacket
     >(
       sql: string,
       values: any,
       callback?:
-        | ((err: QueryError | null, result: T_1, fields: FieldPacket[]) => any)
+        | ((err: QueryError | null, result: T, fields: FieldPacket[]) => any)
         | undefined
     ): Query;
     query<
-      T_2 extends
+      T extends
         | OkPacket
         | ResultSetHeader
         | RowDataPacket[]
         | RowDataPacket[][]
         | OkPacket[]
+        | ProcedureCallPacket
     >(
       options: QueryOptions,
       callback?:
-        | ((err: QueryError | null, result: T_2, fields?: FieldPacket[]) => any)
+        | ((err: QueryError | null, result: T, fields?: FieldPacket[]) => any)
         | undefined
     ): Query;
     query<
-      T_3 extends
+      T extends
         | OkPacket
         | ResultSetHeader
         | RowDataPacket[]
         | RowDataPacket[][]
         | OkPacket[]
+        | ProcedureCallPacket
     >(
       options: QueryOptions,
       values: any,
       callback?:
-        | ((err: QueryError | null, result: T_3, fields: FieldPacket[]) => any)
+        | ((err: QueryError | null, result: T, fields: FieldPacket[]) => any)
         | undefined
     ): Query;
   };

package/typings/mysql/lib/protocol/sequences/promise/ExecutableBase.d.ts

@@ -3,6 +3,7 @@ import {
   FieldPacket,
   RowDataPacket,
   ResultSetHeader,
+  ProcedureCallPacket,
 } from '../../packets/index.js';
 import { QueryOptions, QueryableConstructor } from '../Query.js';
 
@@ -17,40 +18,44 @@ export declare function ExecutableBase<T extends QueryableConstructor>(
         | RowDataPacket[]
         | RowDataPacket[][]
         | OkPacket[]
+        | ProcedureCallPacket
     >(
       sql: string
     ): Promise<[T, FieldPacket[]]>;
     execute<
-      T_1 extends
+      T extends
         | OkPacket
         | ResultSetHeader
         | RowDataPacket[]
         | RowDataPacket[][]
         | OkPacket[]
+        | ProcedureCallPacket
     >(
       sql: string,
       values: any
-    ): Promise<[T_1, FieldPacket[]]>;
+    ): Promise<[T, FieldPacket[]]>;
     execute<
-      T_2 extends
+      T extends
         | OkPacket
         | ResultSetHeader
         | RowDataPacket[]
         | RowDataPacket[][]
         | OkPacket[]
+        | ProcedureCallPacket
     >(
       options: QueryOptions
-    ): Promise<[T_2, FieldPacket[]]>;
+    ): Promise<[T, FieldPacket[]]>;
     execute<
-      T_3 extends
+      T extends
         | OkPacket
         | ResultSetHeader
         | RowDataPacket[]
         | RowDataPacket[][]
         | OkPacket[]
+        | ProcedureCallPacket
     >(
       options: QueryOptions,
       values: any
-    ): Promise<[T_3, FieldPacket[]]>;
+    ): Promise<[T, FieldPacket[]]>;
   };
 } & T;

package/typings/mysql/lib/protocol/sequences/promise/QueryableBase.d.ts

@@ -3,6 +3,7 @@ import {
   FieldPacket,
   RowDataPacket,
   ResultSetHeader,
+  ProcedureCallPacket,
 } from '../../packets/index.js';
 import { QueryOptions, QueryableConstructor } from '../Query.js';
 
@@ -17,40 +18,44 @@ export declare function QueryableBase<T extends QueryableConstructor>(
         | RowDataPacket[]
         | RowDataPacket[][]
         | OkPacket[]
+        | ProcedureCallPacket
     >(
       sql: string
     ): Promise<[T, FieldPacket[]]>;
     query<
-      T_1 extends
+      T extends
         | OkPacket
         | ResultSetHeader
         | RowDataPacket[]
         | RowDataPacket[][]
         | OkPacket[]
+        | ProcedureCallPacket
     >(
       sql: string,
       values: any
-    ): Promise<[T_1, FieldPacket[]]>;
+    ): Promise<[T, FieldPacket[]]>;
     query<
-      T_2 extends
+      T extends
         | OkPacket
         | ResultSetHeader
         | RowDataPacket[]
         | RowDataPacket[][]
         | OkPacket[]
+        | ProcedureCallPacket
     >(
       options: QueryOptions
-    ): Promise<[T_2, FieldPacket[]]>;
+    ): Promise<[T, FieldPacket[]]>;
     query<
-      T_3 extends
+      T extends
         | OkPacket
         | ResultSetHeader
         | RowDataPacket[]
         | RowDataPacket[][]
         | OkPacket[]
+        | ProcedureCallPacket
     >(
       options: QueryOptions,
       values: any
-    ): Promise<[T_3, FieldPacket[]]>;
+    ): Promise<[T, FieldPacket[]]>;
   };
 } & T;