mysql2 3.17.1 → 3.17.3

package/lib/base/pool.js

@@ -6,6 +6,22 @@ const EventEmitter = require('events').EventEmitter;
 const PoolConnection = require('../pool_connection.js');
 const Queue = require('denque');
 const BaseConnection = require('./connection.js');
+const Errors = require('../constants/errors.js');
+
+// Source: https://github.com/go-sql-driver/mysql/blob/76c00e35a8d48f8f70f0e7dffe584692bd3fa612/packets.go#L598-L613
+function isReadOnlyError(err) {
+  if (!err || !err.errno) {
+    return false;
+  }
+  // 1792: ER_CANT_EXECUTE_IN_READ_ONLY_TRANSACTION
+  // 1290: ER_OPTION_PREVENTS_STATEMENT (returned by Aurora during failover)
+  // 1836: ER_READ_ONLY_MODE
+  return (
+    err.errno === Errors.ER_OPTION_PREVENTS_STATEMENT ||
+    err.errno === Errors.ER_CANT_EXECUTE_IN_READ_ONLY_TRANSACTION ||
+    err.errno === Errors.ER_READ_ONLY_MODE
+  );
+}
 
 function spliceConnection(queue, connection) {
   const len = queue.length;
@@ -146,8 +162,24 @@ class BasePool extends EventEmitter {
         return;
       }
       try {
+        let queryError = null;
+        const origOnResult = cmdQuery.onResult;
+        if (origOnResult) {
+          cmdQuery.onResult = function (err, rows, fields) {
+            queryError = err || null;
+            origOnResult(err, rows, fields);
+          };
+        } else {
+          cmdQuery.once('error', (err) => {
+            queryError = err;
+          });
+        }
         conn.query(cmdQuery).once('end', () => {
-          conn.release();
+          if (isReadOnlyError(queryError)) {
+            conn.destroy();
+          } else {
+            conn.release();
+          }
         });
       } catch (e) {
         conn.release();
@@ -169,9 +201,16 @@ class BasePool extends EventEmitter {
         return cb(err);
       }
       try {
-        conn.execute(sql, values, cb).once('end', () => {
-          conn.release();
-        });
+        conn
+          .execute(sql, values, (err, rows, fields) => {
+            if (isReadOnlyError(err)) {
+              conn.destroy();
+            }
+            cb(err, rows, fields);
+          })
+          .once('end', () => {
+            conn.release();
+          });
       } catch (e) {
         conn.release();
         return cb(e);

package/lib/base/pool_connection.js

@@ -29,10 +29,10 @@ class BasePoolConnection extends BaseConnection {
     this._pool.releaseConnection(this);
   }
 
-  end() {
+  end(callback) {
     if (this.config.gracefulEnd) {
       this._removeFromPool();
-      super.end();
+      super.end(callback);
 
       return;
     }
@@ -46,6 +46,9 @@ class BasePoolConnection extends BaseConnection {
     this.emit('warn', err);
     console.warn(err.message);
     this.release();
+    if (typeof callback === 'function') {
+      callback();
+    }
   }
 
   destroy() {

package/lib/compressed_protocol.js

@@ -6,6 +6,32 @@
 const zlib = require('zlib');
 const PacketParser = require('./packet_parser.js');
 
+class Queue {
+  constructor() {
+    this._queue = [];
+    this._running = false;
+  }
+
+  push(fn) {
+    this._queue.push(fn);
+    if (!this._running) {
+      this._running = true;
+      process.nextTick(() => this._next());
+    }
+  }
+
+  _next() {
+    const task = this._queue.shift();
+    if (!task) {
+      this._running = false;
+      return;
+    }
+    task({
+      done: () => process.nextTick(() => this._next()),
+    });
+  }
+}
+
 function handleCompressedPacket(packet) {
   // eslint-disable-next-line consistent-this, no-invalid-this
   const connection = this;
@@ -117,11 +143,11 @@ function enableCompression(connection) {
   connection.writeUncompressed = connection.write;
   connection.write = writeCompressed;
 
-  const seqqueue = require('seq-queue');
-  connection.inflateQueue = seqqueue.createQueue();
-  connection.deflateQueue = seqqueue.createQueue();
+  connection.inflateQueue = new Queue();
+  connection.deflateQueue = new Queue();
 }
 
 module.exports = {
   enableCompression: enableCompression,
+  Queue: Queue,
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mysql2",
-  "version": "3.17.1",
+  "version": "3.17.3",
   "description": "fast mysql driver. Implements core protocol, prepared statements, ssl and compression in native JS",
   "main": "index.js",
   "typings": "typings/mysql/index",
@@ -8,17 +8,22 @@
   "scripts": {
     "lint": "eslint . && prettier --check .",
     "lint:fix": "eslint . --fix && prettier --write .",
-    "test": "poku -d -r=verbose --sequential test/esm test/unit test/integration",
-    "test:bun": "bun poku -d --sequential test/esm test/unit test/integration",
-    "test:deno": "deno run --allow-read --allow-env --allow-run npm:poku -d --sequential --denoAllow=\"read,env,net,sys\" test/esm test/unit test/integration",
-    "test:tsc-build": "cd \"test/tsc-build\" && npx tsc -p \"tsconfig.json\"",
+    "test": "npm run test:parallel && npm run test:global",
+    "test:parallel": "poku -c=\"poku.config.mjs\" test/esm",
+    "test:global": "cross-env SUITE=global poku -c=\"poku.config.mjs\" test/esm/global",
+    "test:bun": "npm run test:bun:parallel",
+    "test:bun:parallel": "bun poku -c=\"poku.config.mjs\" test/esm",
+    "test:deno": "npm run test:deno:parallel && npm run test:deno:global",
+    "test:deno:parallel": "deno run --allow-read --allow-env --allow-run npm:poku@canary -c=\"poku.config.mjs\" test/esm",
+    "test:deno:global": "cross-env SUITE=global deno run --allow-read --allow-env --allow-run npm:poku@canary -c=\"poku.config.mjs\" test/esm/global",
     "test:docker:up": "docker compose -f test/docker-compose.yml up --abort-on-container-exit --remove-orphans",
     "test:docker:down": "docker compose -f test/docker-compose.yml down",
     "test:docker:node": "npm run test:docker:up -- node && npm run test:docker:down",
     "test:docker:bun": "npm run test:docker:up -- bun && npm run test:docker:down",
     "test:docker:deno": "npm run test:docker:up -- deno && npm run test:docker:down",
     "test:docker:coverage": "npm run test:docker:up -- coverage && npm run test:docker:down",
-    "coverage-test": "c8 npm run test",
+    "test:coverage": "c8 npm test",
+    "typecheck": "cd \"test/tsc-build\" && tsc -p \"tsconfig.json\" && cd ../esm && tsc -p \"tsconfig.json\" --noEmit",
     "benchmark": "node ./benchmarks/benchmark.js",
     "wait-port": "wait-on"
   },
@@ -57,30 +62,31 @@
     "generate-function": "^2.3.1",
     "iconv-lite": "^0.7.2",
     "long": "^5.3.2",
-    "lru.min": "^1.1.3",
+    "lru.min": "^1.1.4",
     "named-placeholders": "^1.1.6",
-    "seq-queue": "^0.0.5",
-    "sql-escaper": "^1.3.2"
+    "sql-escaper": "^1.3.3"
   },
   "devDependencies": {
     "@eslint/eslintrc": "^3.3.3",
     "@eslint/js": "^9.39.2",
     "@eslint/markdown": "^7.5.1",
-    "@types/node": "^25.0.9",
-    "@typescript-eslint/eslint-plugin": "^8.53.0",
-    "@typescript-eslint/parser": "^8.53.0",
+    "@ianvs/prettier-plugin-sort-imports": "^4.7.1",
+    "@types/node": "^25.3.0",
+    "@typescript-eslint/eslint-plugin": "^8.56.0",
+    "@typescript-eslint/parser": "^8.56.0",
     "assert-diff": "^3.0.4",
     "benchmark": "^2.1.4",
     "c8": "^10.1.3",
+    "cross-env": "^10.1.0",
     "error-stack-parser": "^2.1.4",
     "eslint-config-prettier": "^10.1.8",
     "eslint-plugin-async-await": "^0.0.0",
-    "eslint-plugin-markdown": "^5.1.0",
     "eslint-plugin-prettier": "^5.5.5",
-    "globals": "^17.0.0",
-    "poku": "^3.0.2",
+    "globals": "^17.3.0",
+    "poku": "^3.0.3-canary.8f374795",
     "portfinder": "^1.0.38",
-    "prettier": "^3.8.0",
+    "prettier": "^3.8.1",
+    "tsx": "^4.21.0",
     "typescript": "^5.9.3"
   }
 }