mysql2 3.23.2 → 3.23.3-canary.20f732b

package/lib/base/connection.js

@@ -104,7 +104,8 @@ class BaseConnection extends EventEmitter {
       this.handlePacket(p);
     });
     this.stream.on('data', (data) => {
-      if (this.connectTimeout) {
+      // Server-side connections do not run ClientHandshake.
+      if (this.connectTimeout && this.config.isServer) {
         Timers.clearTimeout(this.connectTimeout);
         this.connectTimeout = null;
       }
@@ -133,6 +134,10 @@ class BaseConnection extends EventEmitter {
     if (!this.config.isServer) {
       handshakeCommand = new Commands.ClientHandshake(this.config.clientFlags);
       handshakeCommand.on('end', () => {
+        if (this.connectTimeout) {
+          Timers.clearTimeout(this.connectTimeout);
+          this.connectTimeout = null;
+        }
         // this happens when handshake finishes early either because there was
         // some fatal error or the server sent an error packet instead of
         // an hello packet (for example, 'Too many connections' error)
@@ -271,13 +276,11 @@ class BaseConnection extends EventEmitter {
       // connection handshake is special because we allow it to be implicit
       // if error happened during handshake, but there are others commands in queue
       // then bubble error to other commands and not to connection
-    } else if (
-      !(
-        this._command &&
-        this._command.constructor === Commands.ClientHandshake &&
-        this._commands.length > 0
-      )
-    ) {
+    } else if (!(
+      this._command &&
+      this._command.constructor === Commands.ClientHandshake &&
+      this._commands.length > 0
+    )) {
       bubbleErrorToConnection = true;
     }
     while ((command = this._commands.shift())) {
@@ -583,7 +586,7 @@ class BaseConnection extends EventEmitter {
     return cmd;
   }
 
-  format(sql, values) {
+  format(sql, values, namedPlaceholders) {
     if (typeof this.config.queryFormat === 'function') {
       return this.config.queryFormat.call(
         this,
@@ -596,6 +599,9 @@ class BaseConnection extends EventEmitter {
       sql: sql,
       values: values,
     };
+    if (typeof namedPlaceholders !== 'undefined') {
+      opts.namedPlaceholders = namedPlaceholders;
+    }
     this._resolveNamedPlaceholders(opts);
     return SqlString.format(
       opts.sql,
@@ -619,7 +625,10 @@ class BaseConnection extends EventEmitter {
 
   _resolveNamedPlaceholders(options) {
     let unnamed;
-    if (this.config.namedPlaceholders || options.namedPlaceholders) {
+    if (typeof options.namedPlaceholders === 'undefined') {
+      options.namedPlaceholders = this.config.namedPlaceholders;
+    }
+    if (options.namedPlaceholders) {
       if (Array.isArray(options.values)) {
         // if an array is provided as the values, assume the conversion is not necessary.
         // this allows the usage of unnamed placeholders even if the namedPlaceholders flag is enabled.
@@ -644,7 +653,8 @@ class BaseConnection extends EventEmitter {
     this._resolveNamedPlaceholders(cmdQuery);
     const rawSql = this.format(
       cmdQuery.sql,
-      cmdQuery.values !== undefined ? cmdQuery.values : []
+      cmdQuery.values !== undefined ? cmdQuery.values : [],
+      cmdQuery.namedPlaceholders
     );
     cmdQuery.sql = rawSql;
 

package/lib/base/pool.js

@@ -254,7 +254,11 @@ class BasePool extends EventEmitter {
         });
       } catch (e) {
         conn.release();
-        throw e;
+        if (typeof cmdQuery.onResult === 'function') {
+          cmdQuery.onResult(e);
+        } else {
+          cmdQuery.emit('error', e);
+        }
       }
     });
     return cmdQuery;

package/lib/commands/query.js

@@ -20,7 +20,12 @@ class Query extends Command {
     this.sql = options.sql;
     this.values = options.values;
     this._queryOptions = options;
-    this.namedPlaceholders = options.namedPlaceholders || false;
+    this.namedPlaceholders = Object.prototype.hasOwnProperty.call(
+      options,
+      'namedPlaceholders'
+    )
+      ? options.namedPlaceholders
+      : undefined;
     this.onResult = callback;
     this.timeout = options.timeout;
     this.queryTimeout = null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mysql2",
-  "version": "3.23.2",
+  "version": "3.23.3-canary.20f732b",
   "description": "fast mysql driver. Implements core protocol, prepared statements, ssl and compression in native JS",
   "main": "index.js",
   "typings": "typings/mysql/index",
@@ -56,7 +56,7 @@
     "aws-ssl-profiles": "^1.1.2",
     "denque": "^2.1.0",
     "generate-function": "^2.3.1",
-    "iconv-lite": "^0.7.2",
+    "iconv-lite": "^0.7.3",
     "long": "^5.3.2",
     "lru.min": "^1.1.4",
     "named-placeholders": "^1.1.6",
@@ -66,30 +66,31 @@
     "@types/node": ">= 8"
   },
   "devDependencies": {
-    "@eslint/eslintrc": "^3.3.3",
-    "@eslint/js": "^9.39.2",
-    "@eslint/markdown": "^8.0.1",
+    "@eslint/eslintrc": "^3.3.6",
+    "@eslint/js": "^10.0.1",
+    "@eslint/markdown": "^8.0.3",
     "@ianvs/prettier-plugin-sort-imports": "^4.7.1",
-    "@pokujs/multi-suite": "^1.0.0",
-    "@rollup/plugin-commonjs": "^29.0.2",
+    "@pokujs/multi-suite": "^1.0.2",
+    "@rollup/plugin-commonjs": "^29.0.3",
     "@rollup/plugin-json": "^6.1.0",
     "@rollup/plugin-node-resolve": "^16.0.3",
-    "@types/node": "^26.0.0",
-    "@typescript-eslint/eslint-plugin": "^8.56.0",
-    "@typescript-eslint/parser": "^8.56.0",
+    "@types/node": "^26.2.0",
+    "@typescript-eslint/eslint-plugin": "^8.66.0",
+    "@typescript-eslint/parser": "^8.66.0",
     "assert-diff": "^3.0.4",
     "benchmark": "^2.1.4",
-    "c8": "^11.0.0",
+    "c8": "^12.0.0",
     "error-stack-parser": "^2.1.4",
+    "eslint": "^10.8.1",
     "eslint-config-prettier": "^10.1.8",
     "eslint-plugin-async-await": "^0.0.0",
-    "eslint-plugin-prettier": "^5.5.5",
-    "globals": "^17.3.0",
-    "poku": "^4.1.0",
+    "eslint-plugin-prettier": "^5.5.6",
+    "globals": "^17.9.0",
+    "poku": "^4.5.0",
     "portfinder": "^1.0.38",
-    "prettier": "^3.8.1",
-    "rollup": "^4.59.0",
-    "tsx": "^4.21.0",
-    "typescript": "^5.9.3"
+    "prettier": "^3.9.6",
+    "rollup": "^4.62.4",
+    "tsx": "^4.23.11",
+    "typescript": "^6.0.3"
   }
 }

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

@@ -52,17 +52,13 @@ export declare function tracePromise<T extends object, R>(
 ): Promise<R>;
 
 export declare const queryChannel:
-  | TracingChannel<QueryTraceContext>
-  | undefined;
+  TracingChannel<QueryTraceContext> | undefined;
 export declare const executeChannel:
-  | TracingChannel<ExecuteTraceContext>
-  | undefined;
+  TracingChannel<ExecuteTraceContext> | undefined;
 export declare const connectChannel:
-  | TracingChannel<ConnectTraceContext>
-  | undefined;
+  TracingChannel<ConnectTraceContext> | undefined;
 export declare const poolConnectChannel:
-  | TracingChannel<PoolConnectTraceContext>
-  | undefined;
+  TracingChannel<PoolConnectTraceContext> | undefined;
 
 export declare function getServerContext(config: {
   socketPath?: string;