mysql2 3.6.2 → 3.6.4

package/lib/commands/client_handshake.js

@@ -137,7 +137,7 @@ class ClientHandshake extends Command {
     if (connection.config.ssl) {
       // client requires SSL but server does not support it
       if (!serverSSLSupport) {
-        const err = new Error('Server does not support secure connnection');
+        const err = new Error('Server does not support secure connection');
         err.code = 'HANDSHAKE_NO_SSL_SUPPORT';
         err.fatal = true;
         this.emit('error', err);

package/lib/connection.js

@@ -623,7 +623,8 @@ class Connection extends EventEmitter {
       options = {
         ...options,
         ...sql,
-        sql: sql.sql
+        sql: sql.sql,
+        values: sql.values
       };
       if (typeof values === 'function') {
         cb = values;
@@ -913,7 +914,8 @@ class Connection extends EventEmitter {
       options = {
         ...options,
         ...sql,
-        sql: sql.sql
+        sql: sql.sql,
+        values: sql.values
       };
       if (typeof values === 'function') {
         cb = values;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mysql2",
-  "version": "3.6.2",
+  "version": "3.6.4",
   "description": "fast mysql driver. Implements core protocol, prepared statements, ssl and compression in native JS",
   "main": "index.js",
   "directories": {
@@ -79,7 +79,7 @@
     "eslint-plugin-async-await": "0.0.0",
     "eslint-plugin-markdown": "^3.0.0",
     "husky": "^8.0.2",
-    "lint-staged": "^14.0.1",
+    "lint-staged": "^15.0.1",
     "portfinder": "^1.0.28",
     "prettier": "^3.0.0",
     "progress": "^2.0.3",

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

@@ -258,6 +258,16 @@ export interface ConnectionOptions {
    */
   rowsAsArray?: boolean;
 
+  /**
+   * Enable keep-alive on the socket. (Default: true)
+   */
+  enableKeepAlive?: boolean;
+
+  /**
+   * If keep-alive is enabled users can supply an initial delay. (Default: 0)
+   */
+  keepAliveInitialDelay?: number;
+
   charsetNumber?: number;
 
   compress?: boolean;
@@ -312,10 +322,14 @@ declare class Connection extends QueryableBase(ExecutableBase(EventEmitter)) {
       | RowDataPacket[]
       | OkPacket
       | OkPacket[]
-      | ResultSetHeader
+      | ResultSetHeader,
   >(
     sql: string,
-    callback?: (err: QueryError | null, result: T, fields: FieldPacket[]) => any
+    callback?: (
+      err: QueryError | null,
+      result: T,
+      fields: FieldPacket[],
+    ) => any,
   ): Query;
   static createQuery<
     T extends
@@ -323,11 +337,15 @@ declare class Connection extends QueryableBase(ExecutableBase(EventEmitter)) {
       | RowDataPacket[]
       | OkPacket
       | OkPacket[]
-      | ResultSetHeader
+      | ResultSetHeader,
   >(
     sql: string,
     values: any | any[] | { [param: string]: any },
-    callback?: (err: QueryError | null, result: T, fields: FieldPacket[]) => any
+    callback?: (
+      err: QueryError | null,
+      result: T,
+      fields: FieldPacket[],
+    ) => any,
   ): Query;
 
   beginTransaction(callback: (err: QueryError | null) => void): void;
@@ -338,7 +356,7 @@ declare class Connection extends QueryableBase(ExecutableBase(EventEmitter)) {
 
   changeUser(
     options: ConnectionOptions,
-    callback?: (err: QueryError | null) => void
+    callback?: (err: QueryError | null) => void,
   ): void;
 
   end(callback?: (err: QueryError | null) => void): void;
@@ -363,7 +381,7 @@ declare class Connection extends QueryableBase(ExecutableBase(EventEmitter)) {
 
   prepare(
     sql: string,
-    callback?: (err: QueryError | null, statement: PrepareStatementInfo) => any
+    callback?: (err: QueryError | null, statement: PrepareStatementInfo) => any,
   ): Prepare;
 
   unprepare(sql: string): PrepareStatementInfo;

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

@@ -37,16 +37,6 @@ export interface PoolOptions extends ConnectionOptions {
    * is no limit to the number of queued connection requests. (Default: 0)
    */
   queueLimit?: number;
-
-  /**
-   * Enable keep-alive on the socket. (Default: true)
-   */
-  enableKeepAlive?: boolean;
-
-  /**
-   * If keep-alive is enabled users can supply an initial delay. (Default: 0)
-   */
-  keepAliveInitialDelay?: number;
 }
 
 declare class Pool extends QueryableBase(ExecutableBase(EventEmitter)) {

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

@@ -3,19 +3,25 @@ declare interface FieldPacket {
     name: 'FieldPacket';
   };
   catalog: string;
-  charsetNr: number;
-  db: string;
+  charsetNr?: number;
+  db?: string;
+  schema?: string;
+  characterSet?: number;
   decimals: number;
-  default: any;
-  flags: number;
-  length: number;
+  default?: any;
+  flags: number | string[];
+  length?: number;
   name: string;
   orgName: string;
   orgTable: string;
-  protocol41: boolean;
+  protocol41?: boolean;
   table: string;
-  type: number;
-  zerofill: boolean;
+  type?: number;
+  columnType?: number
+  zerofill?: boolean;
+  typeName?: string;
+  encoding?: string;
+  columnLength?: number;
 }
 
 export { FieldPacket };