mysql2 3.4.2 → 3.4.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mysql2",
-  "version": "3.4.2",
+  "version": "3.4.4",
   "description": "fast mysql driver. Implements core protocol, prepared statements, ssl and compression in native JS",
   "main": "index.js",
   "directories": {

package/typings/mysql/lib/Pool.d.ts

@@ -10,12 +10,6 @@ import { QueryableBase } from './protocol/sequences/QueryableBase.js';
 import { ExecutableBase } from './protocol/sequences/ExecutableBase.js';
 
 export interface PoolOptions extends ConnectionOptions {
-  /**
-   * The milliseconds before a timeout occurs during the connection acquisition. This is slightly different from connectTimeout,
-   * because acquiring a pool connection does not always involve making a connection. (Default: 10 seconds)
-   */
-  acquireTimeout?: number;
-
   /**
    * Determines the pool's action when no connections are available and the limit has been reached. If true, the pool will queue
    * the connection request and call it when one becomes available. If false, the pool will immediately call back with an error.

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;