mysql2 3.9.2 → 3.9.3

package/lib/packets/column_definition.js

@@ -47,7 +47,7 @@ class ColumnDefinition {
     this.name = StringParser.decode(
       this._buf,
       this.encoding === 'binary' ? this._clientEncoding : this.encoding,
-      _nameStart, 
+      _nameStart,
       _nameStart + _nameLength
     );
     this.columnLength = packet.readInt32();
@@ -90,7 +90,7 @@ class ColumnDefinition {
         if (f === 'PRI_KEY') {
           flagNames.push('PRIMARY KEY');
         } else if (f === 'NOT_NULL') {
-          flagNames.push('NOT NULL'); 
+          flagNames.push('NOT NULL');
         } else if (f === 'BINARY') {
           // ignore flag for now
         } else if (f === 'MULTIPLE_KEY') {
@@ -98,7 +98,7 @@ class ColumnDefinition {
           // in the schema usually this is part of index definition
           // example: UNIQUE KEY `my_uniq_id` (`id_box_elements`,`id_router`)
           // note that only first column has MULTIPLE_KEY flag set in this case
-          // so there is no good way of knowing that this is part of index just 
+          // so there is no good way of knowing that this is part of index just
           // by looking at indifidual field flags
         } else if (f === 'NO_DEFAULT_VALUE') {
           // almost the same as NOT_NULL?
@@ -265,10 +265,10 @@ const addString = function(name) {
       const val = StringParser.decode(
         this._buf,
         this.encoding === 'binary' ? this._clientEncoding : this.encoding,
-        start, 
+        start,
         end
       );
-      
+
       Object.defineProperty(this, name, {
         value: val,
         writable: false,

package/lib/parsers/parser_cache.js

@@ -3,26 +3,38 @@
 const LRU = require('lru-cache').default;
 
 const parserCache = new LRU({
-  max: 15000
+  max: 15000,
 });
 
 function keyFromFields(type, fields, options, config) {
-  let res =
-    `${type}` +
-    `/${typeof options.nestTables}` +
-    `/${options.nestTables}` +
-    `/${options.rowsAsArray}` +
-    `/${options.supportBigNumbers || config.supportBigNumbers}` +
-    `/${options.bigNumberStrings || config.bigNumberStrings}` +
-    `/${typeof options.typeCast}` +
-    `/${options.timezone || config.timezone}` +
-    `/${options.decimalNumbers}` +
-    `/${options.dateStrings}`;
+  const res = [
+    type,
+    typeof options.nestTables,
+    options.nestTables,
+    Boolean(options.rowsAsArray),
+    Boolean(options.supportBigNumbers || config.supportBigNumbers),
+    Boolean(options.bigNumberStrings || config.bigNumberStrings),
+    typeof options.typeCast,
+    options.timezone || config.timezone,
+    Boolean(options.decimalNumbers),
+    options.dateStrings,
+  ];
+
   for (let i = 0; i < fields.length; ++i) {
     const field = fields[i];
-    res += `/${field.name}:${field.columnType}:${field.length}:${field.schema}:${field.table}:${field.flags}:${field.characterSet}`;
+
+    res.push([
+      field.name,
+      field.columnType,
+      field.length,
+      field.schema,
+      field.table,
+      field.flags,
+      field.characterSet,
+    ]);
   }
-  return res;
+
+  return JSON.stringify(res, null, 0);
 }
 
 function getParser(type, fields, options, config, compiler) {
@@ -49,5 +61,6 @@ function clearCache() {
 module.exports = {
   getParser: getParser,
   setMaxCache: setMaxCache,
-  clearCache: clearCache
+  clearCache: clearCache,
+  _keyFromFields: keyFromFields,
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mysql2",
-  "version": "3.9.2",
+  "version": "3.9.3",
   "description": "fast mysql driver. Implements core protocol, prepared statements, ssl and compression in native JS",
   "main": "index.js",
   "typings": "typings/mysql/index",
@@ -8,10 +8,12 @@
     "lint": "npm run lint:docs && npm run lint:code",
     "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",
-    "test": "node ./test/run.js",
-    "test:builtin-node-runner": "NODE_V8_COVERAGE=./coverage node --test --experimental-test-coverage test/builtin-runner",
+    "lint:typings": "npx prettier --check ./typings",
+    "lint:tests": "npx prettier --check ./test",
+    "test": "poku --debug --include=\"test/esm,test/unit,test/integration\"",
+    "test:bun": "poku --debug --platform=\"bun\" --include=\"test/esm,test/unit,test/integration\"",
     "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",
+    "coverage-test": "c8 -r cobertura -r lcov -r text npm run test",
     "benchmark": "node ./benchmarks/benchmark.js",
     "prettier": "prettier --single-quote --trailing-comma none --write \"{lib,test}/**/*.js\"",
     "prettier:docs": "prettier --single-quote --trailing-comma none --write README.md",
@@ -75,13 +77,13 @@
     "eslint": "^8.27.0",
     "eslint-config-prettier": "^9.0.0",
     "eslint-plugin-async-await": "0.0.0",
-    "eslint-plugin-markdown": "^3.0.0",
+    "eslint-plugin-markdown": "^4.0.1",
     "husky": "^9.0.2",
     "lint-staged": "^15.0.1",
+    "poku": "^1.8.1",
     "portfinder": "^1.0.28",
     "prettier": "^3.0.0",
     "progress": "^2.0.3",
-    "typescript": "^5.0.2",
-    "utest": "0.0.8"
+    "typescript": "^5.0.2"
   }
 }

package/typings/mysql/index.d.ts

@@ -62,14 +62,14 @@ export function format(
   sql: string,
   values: any[],
   stringifyObjects?: boolean,
-  timeZone?: string
+  timeZone?: string,
 ): string;
 
 export function format(
   sql: string,
   values: any,
   stringifyObjects?: boolean,
-  timeZone?: string
+  timeZone?: string,
 ): string;
 
 export function raw(sql: string): {

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

@@ -5,7 +5,7 @@ export type AuthPlugin = (pluginMetadata: {
   connection: Connection;
   command: string;
 }) => (
-  pluginData: Buffer
+  pluginData: Buffer,
 ) => Promise<string> | string | Buffer | Promise<Buffer> | null;
 
 type AuthPluginDefinition<T> = (pluginOptions?: T) => AuthPlugin;

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

@@ -43,14 +43,14 @@ declare class Pool extends QueryableBase(ExecutableBase(EventEmitter)) {
   getConnection(
     callback: (
       err: NodeJS.ErrnoException | null,
-      connection: PoolConnection
-    ) => any
+      connection: PoolConnection,
+    ) => any,
   ): void;
 
   releaseConnection(connection: PoolConnection | PromisePoolConnection): void;
 
   end(
-    callback?: (err: NodeJS.ErrnoException | null, ...args: any[]) => any
+    callback?: (err: NodeJS.ErrnoException | null, ...args: any[]) => any,
   ): void;
 
   on(event: string, listener: (...args: any[]) => void): this;

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

@@ -6,7 +6,7 @@ import { QueryableBase as QueryableBaseClass } from './protocol/sequences/Querya
 
 // Expose class interfaces
 declare class QueryableAndExecutableBase extends QueryableBaseClass(
-  ExecutableBaseClass(EventEmitter)
+  ExecutableBaseClass(EventEmitter),
 ) {}
 
 export interface PoolClusterOptions {
@@ -40,8 +40,8 @@ export interface PoolNamespace extends QueryableAndExecutableBase {
   getConnection(
     callback: (
       err: NodeJS.ErrnoException | null,
-      connection: PoolConnection
-    ) => any
+      connection: PoolConnection,
+    ) => any,
   ): void;
 }
 
@@ -57,23 +57,23 @@ declare class PoolCluster extends EventEmitter {
   getConnection(
     callback: (
       err: NodeJS.ErrnoException | null,
-      connection: PoolConnection
-    ) => void
+      connection: PoolConnection,
+    ) => void,
   ): void;
   getConnection(
     group: string,
     callback: (
       err: NodeJS.ErrnoException | null,
-      connection: PoolConnection
-    ) => void
+      connection: PoolConnection,
+    ) => void,
   ): void;
   getConnection(
     group: string,
     selector: string,
     callback: (
       err: NodeJS.ErrnoException | null,
-      connection: PoolConnection
-    ) => void
+      connection: PoolConnection,
+    ) => void,
   ): void;
 
   of(pattern: string, selector?: string): PoolNamespace;

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

@@ -17,7 +17,7 @@ declare interface FieldPacket {
   protocol41?: boolean;
   table: string;
   type?: number;
-  columnType?: number
+  columnType?: number;
   zerofill?: boolean;
   typeName?: string;
   encoding?: string;

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

@@ -17,7 +17,7 @@ declare interface OkPacket {
   serverStatus: number;
   warningCount: number;
   message: string;
-  procotol41: boolean;
+  protocol41: boolean;
 }
 
 export { OkPacket };

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

@@ -7,7 +7,7 @@ declare type ProcedureCallPacket<
 > = T extends RowDataPacket[]
   ? [T, ResultSetHeader]
   : T extends ResultSetHeader | OkPacket
-  ? ResultSetHeader
-  : [RowDataPacket[], ResultSetHeader] | ResultSetHeader;
+    ? ResultSetHeader
+    : [RowDataPacket[], ResultSetHeader] | ResultSetHeader;
 
 export { ProcedureCallPacket };

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

@@ -7,6 +7,15 @@ import { ResultSetHeader } from './ResultSetHeader.js';
 import { OkPacketParams } from './params/OkPacketParams.js';
 import { ErrorPacketParams } from './params/ErrorPacketParams.js';
 
+export type QueryResult =
+  | OkPacket
+  | ResultSetHeader
+  | ResultSetHeader[]
+  | RowDataPacket[]
+  | RowDataPacket[][]
+  | OkPacket[]
+  | ProcedureCallPacket;
+
 export {
   OkPacket,
   RowDataPacket,

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

@@ -1,10 +1,4 @@
-import {
-  OkPacket,
-  FieldPacket,
-  RowDataPacket,
-  ResultSetHeader,
-  ProcedureCallPacket,
-} from '../packets/index.js';
+import { FieldPacket, QueryResult } from '../packets/index.js';
 import {
   Query,
   QueryError,
@@ -13,70 +7,34 @@ import {
 } from './Query.js';
 
 export declare function ExecutableBase<T extends QueryableConstructor>(
-  Base?: T
+  Base?: T,
 ): {
   new (...args: any[]): {
-    execute<
-      T extends
-        | OkPacket
-        | ResultSetHeader
-        | ResultSetHeader[]
-        | RowDataPacket[]
-        | RowDataPacket[][]
-        | OkPacket[]
-        | ProcedureCallPacket
-    >(
+    execute<T extends QueryResult>(
       sql: string,
       callback?:
         | ((err: QueryError | null, result: T, fields: FieldPacket[]) => any)
-        | undefined
+        | undefined,
     ): Query;
-    execute<
-      T extends
-        | OkPacket
-        | ResultSetHeader
-        | ResultSetHeader[]
-        | RowDataPacket[]
-        | RowDataPacket[][]
-        | OkPacket[]
-        | ProcedureCallPacket
-    >(
+    execute<T extends QueryResult>(
       sql: string,
       values: any,
       callback?:
         | ((err: QueryError | null, result: T, fields: FieldPacket[]) => any)
-        | undefined
+        | undefined,
     ): Query;
-    execute<
-      T extends
-        | OkPacket
-        | ResultSetHeader
-        | ResultSetHeader[]
-        | RowDataPacket[]
-        | RowDataPacket[][]
-        | OkPacket[]
-        | ProcedureCallPacket
-    >(
+    execute<T extends QueryResult>(
       options: QueryOptions,
       callback?:
         | ((err: QueryError | null, result: T, fields?: FieldPacket[]) => any)
-        | undefined
+        | undefined,
     ): Query;
-    execute<
-      T extends
-        | OkPacket
-        | ResultSetHeader
-        | ResultSetHeader[]
-        | RowDataPacket[]
-        | RowDataPacket[][]
-        | OkPacket[]
-        | ProcedureCallPacket
-    >(
+    execute<T extends QueryResult>(
       options: QueryOptions,
       values: any,
       callback?:
         | ((err: QueryError | null, result: T, fields: FieldPacket[]) => any)
-        | undefined
+        | undefined,
     ): Query;
   };
 } & T;

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

@@ -16,10 +16,14 @@ export class PrepareStatementInfo {
       | RowDataPacket[]
       | OkPacket
       | OkPacket[]
-      | ResultSetHeader
+      | ResultSetHeader,
   >(
     parameters: any | any[] | { [param: string]: any },
-    callback?: (err: QueryError | null, result: T, fields: FieldPacket[]) => any
+    callback?: (
+      err: QueryError | null,
+      result: T,
+      fields: FieldPacket[],
+    ) => any,
   ): Query;
 }
 
@@ -53,11 +57,11 @@ declare class Prepare extends Sequence {
   on(event: 'error', listener: (err: QueryError) => any): this;
   on(
     event: 'fields',
-    listener: (fields: FieldPacket, index: number) => any
+    listener: (fields: FieldPacket, index: number) => any,
   ): this;
   on(
     event: 'result',
-    listener: (result: RowDataPacket | OkPacket, index: number) => any
+    listener: (result: RowDataPacket | OkPacket, index: number) => any,
   ): this;
   on(event: 'end', listener: () => any): this;
 }

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

@@ -1,10 +1,4 @@
-import {
-  OkPacket,
-  FieldPacket,
-  RowDataPacket,
-  ResultSetHeader,
-  ProcedureCallPacket,
-} from '../packets/index.js';
+import { FieldPacket, QueryResult } from '../packets/index.js';
 import {
   Query,
   QueryError,
@@ -13,70 +7,34 @@ import {
 } from './Query.js';
 
 export declare function QueryableBase<T extends QueryableConstructor>(
-  Base?: T
+  Base?: T,
 ): {
   new (...args: any[]): {
-    query<
-      T extends
-        | OkPacket
-        | ResultSetHeader
-        | ResultSetHeader[]
-        | RowDataPacket[]
-        | RowDataPacket[][]
-        | OkPacket[]
-        | ProcedureCallPacket
-    >(
+    query<T extends QueryResult>(
       sql: string,
       callback?:
         | ((err: QueryError | null, result: T, fields: FieldPacket[]) => any)
-        | undefined
+        | undefined,
     ): Query;
-    query<
-      T extends
-        | OkPacket
-        | ResultSetHeader
-        | ResultSetHeader[]
-        | RowDataPacket[]
-        | RowDataPacket[][]
-        | OkPacket[]
-        | ProcedureCallPacket
-    >(
+    query<T extends QueryResult>(
       sql: string,
       values: any,
       callback?:
         | ((err: QueryError | null, result: T, fields: FieldPacket[]) => any)
-        | undefined
+        | undefined,
     ): Query;
-    query<
-      T extends
-        | OkPacket
-        | ResultSetHeader
-        | ResultSetHeader[]
-        | RowDataPacket[]
-        | RowDataPacket[][]
-        | OkPacket[]
-        | ProcedureCallPacket
-    >(
+    query<T extends QueryResult>(
       options: QueryOptions,
       callback?:
         | ((err: QueryError | null, result: T, fields?: FieldPacket[]) => any)
-        | undefined
+        | undefined,
     ): Query;
-    query<
-      T extends
-        | OkPacket
-        | ResultSetHeader
-        | ResultSetHeader[]
-        | RowDataPacket[]
-        | RowDataPacket[][]
-        | OkPacket[]
-        | ProcedureCallPacket
-    >(
+    query<T extends QueryResult>(
       options: QueryOptions,
       values: any,
       callback?:
         | ((err: QueryError | null, result: T, fields: FieldPacket[]) => any)
-        | undefined
+        | undefined,
     ): Query;
   };
 } & T;

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

@@ -1,65 +1,21 @@
-import {
-  OkPacket,
-  FieldPacket,
-  RowDataPacket,
-  ResultSetHeader,
-  ProcedureCallPacket,
-} from '../../packets/index.js';
+import { FieldPacket, QueryResult } from '../../packets/index.js';
 import { QueryOptions, QueryableConstructor } from '../Query.js';
 
 export declare function ExecutableBase<T extends QueryableConstructor>(
-  Base?: T
+  Base?: T,
 ): {
   new (...args: any[]): {
-    execute<
-      T extends
-        | OkPacket
-        | ResultSetHeader
-        | ResultSetHeader[]
-        | RowDataPacket[]
-        | RowDataPacket[][]
-        | OkPacket[]
-        | ProcedureCallPacket
-    >(
-      sql: string
-    ): Promise<[T, FieldPacket[]]>;
-    execute<
-      T extends
-        | OkPacket
-        | ResultSetHeader
-        | ResultSetHeader[]
-        | RowDataPacket[]
-        | RowDataPacket[][]
-        | OkPacket[]
-        | ProcedureCallPacket
-    >(
+    execute<T extends QueryResult>(sql: string): Promise<[T, FieldPacket[]]>;
+    execute<T extends QueryResult>(
       sql: string,
-      values: any
+      values: any,
     ): Promise<[T, FieldPacket[]]>;
-    execute<
-      T extends
-        | OkPacket
-        | ResultSetHeader
-        | ResultSetHeader[]
-        | RowDataPacket[]
-        | RowDataPacket[][]
-        | OkPacket[]
-        | ProcedureCallPacket
-    >(
-      options: QueryOptions
+    execute<T extends QueryResult>(
+      options: QueryOptions,
     ): Promise<[T, FieldPacket[]]>;
-    execute<
-      T extends
-        | OkPacket
-        | ResultSetHeader
-        | ResultSetHeader[]
-        | RowDataPacket[]
-        | RowDataPacket[][]
-        | OkPacket[]
-        | ProcedureCallPacket
-    >(
+    execute<T extends QueryResult>(
       options: QueryOptions,
-      values: any
+      values: any,
     ): Promise<[T, FieldPacket[]]>;
   };
 } & T;

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

@@ -1,65 +1,21 @@
-import {
-  OkPacket,
-  FieldPacket,
-  RowDataPacket,
-  ResultSetHeader,
-  ProcedureCallPacket,
-} from '../../packets/index.js';
+import { FieldPacket, QueryResult } from '../../packets/index.js';
 import { QueryOptions, QueryableConstructor } from '../Query.js';
 
 export declare function QueryableBase<T extends QueryableConstructor>(
-  Base?: T
+  Base?: T,
 ): {
   new (...args: any[]): {
-    query<
-      T extends
-        | OkPacket
-        | ResultSetHeader
-        | ResultSetHeader[]
-        | RowDataPacket[]
-        | RowDataPacket[][]
-        | OkPacket[]
-        | ProcedureCallPacket
-    >(
-      sql: string
-    ): Promise<[T, FieldPacket[]]>;
-    query<
-      T extends
-        | OkPacket
-        | ResultSetHeader
-        | ResultSetHeader[]
-        | RowDataPacket[]
-        | RowDataPacket[][]
-        | OkPacket[]
-        | ProcedureCallPacket
-    >(
+    query<T extends QueryResult>(sql: string): Promise<[T, FieldPacket[]]>;
+    query<T extends QueryResult>(
       sql: string,
-      values: any
+      values: any,
     ): Promise<[T, FieldPacket[]]>;
-    query<
-      T extends
-        | OkPacket
-        | ResultSetHeader
-        | ResultSetHeader[]
-        | RowDataPacket[]
-        | RowDataPacket[][]
-        | OkPacket[]
-        | ProcedureCallPacket
-    >(
-      options: QueryOptions
+    query<T extends QueryResult>(
+      options: QueryOptions,
     ): Promise<[T, FieldPacket[]]>;
-    query<
-      T extends
-        | OkPacket
-        | ResultSetHeader
-        | ResultSetHeader[]
-        | RowDataPacket[]
-        | RowDataPacket[][]
-        | OkPacket[]
-        | ProcedureCallPacket
-    >(
+    query<T extends QueryResult>(
       options: QueryOptions,
-      values: any
+      values: any,
     ): Promise<[T, FieldPacket[]]>;
   };
 } & T;