mysql2 3.5.2 → 3.6.1

package/lib/connection.js

@@ -615,10 +615,15 @@ class Connection extends EventEmitter {
   }
 
   execute(sql, values, cb) {
-    let options = {};
+    let options = {
+      infileStreamFactory: this.config.infileStreamFactory
+    };
     if (typeof sql === 'object') {
       // execute(options, cb)
-      options = sql;
+      options = {
+        ...options,
+        ...sql
+      };
       if (typeof values === 'function') {
         cb = values;
       } else {
@@ -899,11 +904,15 @@ class Connection extends EventEmitter {
 
   static createQuery(sql, values, cb, config) {
     let options = {
-      rowsAsArray: config.rowsAsArray
+      rowsAsArray: config.rowsAsArray,
+      infileStreamFactory: config.infileStreamFactory
     };
     if (typeof sql === 'object') {
       // query(options, cb)
-      options = sql;
+      options = {
+        ...options,
+        ...sql
+      };
       if (typeof values === 'function') {
         cb = values;
       } else if (values !== undefined) {

package/lib/connection_config.js

@@ -30,6 +30,7 @@ const validOptions = {
   flags: 1,
   host: 1,
   insecureAuth: 1,
+  infileStreamFactory: 1,
   isServer: 1,
   keepAliveInitialDelay: 1,
   localAddress: 1,
@@ -108,6 +109,7 @@ class ConnectionConfig {
       ? 10 * 1000
       : options.connectTimeout;
     this.insecureAuth = options.insecureAuth || false;
+    this.infileStreamFactory = options.infileStreamFactory || undefined;
     this.supportBigNumbers = options.supportBigNumbers || false;
     this.bigNumberStrings = options.bigNumberStrings || false;
     this.decimalNumbers = options.decimalNumbers || false;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mysql2",
-  "version": "3.5.2",
+  "version": "3.6.1",
   "description": "fast mysql driver. Implements core protocol, prepared statements, ssl and compression in native JS",
   "main": "index.js",
   "directories": {
@@ -75,7 +75,7 @@
     "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",

package/promise.d.ts

@@ -115,7 +115,7 @@ 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;
 }

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

@@ -4,6 +4,7 @@
 // Modifications copyright (c) 2021, Oracle and/or its affiliates.
 
 import { EventEmitter } from 'events';
+import { Readable } from 'stream';
 import { Query, QueryError } from './protocol/sequences/Query.js';
 import { Prepare, PrepareStatementInfo } from './protocol/sequences/Prepare.js';
 import {
@@ -165,6 +166,11 @@ export interface ConnectionOptions {
    */
   insecureAuth?: boolean;
 
+  /**
+   * By specifying a function that returns a readable stream, an arbitrary stream can be sent when sending a local fs file.
+   */
+  infileStreamFactory?: (path: string) => Readable;
+
   /**
    * Determines if column values should be converted to native JavaScript types. It is not recommended (and may go away / change in the future)
    * to disable type casting, but you can currently do so on either the connection or query level. (Default: true)
@@ -351,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/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',