mysql2 3.6.0 → 3.6.2

package/lib/connection.js

@@ -622,7 +622,8 @@ class Connection extends EventEmitter {
       // execute(options, cb)
       options = {
         ...options,
-        ...sql
+        ...sql,
+        sql: sql.sql
       };
       if (typeof values === 'function') {
         cb = values;
@@ -911,7 +912,8 @@ class Connection extends EventEmitter {
       // query(options, cb)
       options = {
         ...options,
-        ...sql
+        ...sql,
+        sql: sql.sql
       };
       if (typeof values === 'function') {
         cb = values;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mysql2",
-  "version": "3.6.0",
+  "version": "3.6.2",
   "description": "fast mysql driver. Implements core protocol, prepared statements, ssl and compression in native JS",
   "main": "index.js",
   "directories": {
@@ -75,11 +75,11 @@
     "c8": "^8.0.0",
     "error-stack-parser": "^2.0.3",
     "eslint": "^8.27.0",
-    "eslint-config-prettier": "^8.5.0",
+    "eslint-config-prettier": "^9.0.0",
     "eslint-plugin-async-await": "0.0.0",
     "eslint-plugin-markdown": "^3.0.0",
     "husky": "^8.0.2",
-    "lint-staged": "^13.0.3",
+    "lint-staged": "^14.0.1",
     "portfinder": "^1.0.28",
     "prettier": "^3.0.0",
     "progress": "^2.0.3",

package/promise.d.ts

@@ -18,13 +18,13 @@ export * from './index.js';
 
 // Expose class interfaces
 declare class QueryableAndExecutableBase extends QueryableBaseClass(
-  ExecutableBaseClass(EventEmitter)
+  ExecutableBaseClass(EventEmitter),
 ) {}
 
 export interface PreparedStatementInfo {
   close(): Promise<void>;
   execute(
-    paramaters: any | any[] | { [param: string]: any }
+    parameters: any | any[] | { [param: string]: any },
   ): Promise<
     [
       (
@@ -34,7 +34,7 @@ export interface PreparedStatementInfo {
         | OkPacket[]
         | ResultSetHeader
       ),
-      FieldPacket[]
+      FieldPacket[],
     ]
   >;
 }
@@ -115,14 +115,14 @@ export interface PoolCluster extends EventEmitter {
 
   of(pattern: string, selector?: string): PoolNamespace;
 
-  on(event: string, listener: (args: any[]) => void): this;
+  on(event: string, listener: (...args: any[]) => void): this;
   on(event: 'remove', listener: (nodeId: number) => void): this;
   on(event: 'warn', listener: (err: Error) => void): this;
 }
 
 export function createConnection(connectionUri: string): Promise<Connection>;
 export function createConnection(
-  config: ConnectionOptions
+  config: ConnectionOptions,
 ): Promise<Connection>;
 
 export function createPool(connectionUri: string): Pool;

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

@@ -357,7 +357,7 @@ declare class Connection extends QueryableBase(ExecutableBase(EventEmitter)) {
 
   format(sql: string, values?: any | any[] | { [param: string]: any }): string;
 
-  on(event: string, listener: (args: any[]) => void): this;
+  on(event: string, listener: (...args: any[]) => void): this;
 
   rollback(callback: (err: QueryError | null) => void): void;
 

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

@@ -63,7 +63,7 @@ declare class Pool extends QueryableBase(ExecutableBase(EventEmitter)) {
     callback?: (err: NodeJS.ErrnoException | null, ...args: any[]) => any
   ): void;
 
-  on(event: string, listener: (args: any[]) => void): this;
+  on(event: string, listener: (...args: any[]) => void): this;
   on(event: 'connection', listener: (connection: PoolConnection) => any): this;
   on(event: 'acquire', listener: (connection: PoolConnection) => any): this;
   on(event: 'release', listener: (connection: PoolConnection) => any): this;

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

@@ -78,7 +78,7 @@ declare class PoolCluster extends EventEmitter {
 
   of(pattern: string, selector?: string): PoolNamespace;
 
-  on(event: string, listener: (args: any[]) => void): this;
+  on(event: string, listener: (...args: any[]) => void): this;
   on(event: 'remove', listener: (nodeId: number) => void): this;
   on(event: 'warn', listener: (err: Error) => void): this;
 }

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

@@ -18,7 +18,7 @@ export class PrepareStatementInfo {
       | OkPacket[]
       | ResultSetHeader
   >(
-    paramaters: any | any[] | { [param: string]: any },
+    parameters: any | any[] | { [param: string]: any },
     callback?: (err: QueryError | null, result: T, fields: FieldPacket[]) => any
   ): Query;
 }

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

@@ -133,7 +133,7 @@ declare class Query extends Sequence {
    */
   stream(options?: StreamOptions): Readable;
 
-  on(event: string, listener: (args: any[]) => void): this;
+  on(event: string, listener: (...args: any[]) => void): this;
   on(event: 'error', listener: (err: QueryError) => any): this;
   on(
     event: 'fields',