mysql2 3.9.8 → 3.10.0

package/lib/commands/query.js

@@ -251,7 +251,7 @@ class Query extends Command {
     if (this.onResult) {
       this._rows[this._resultIndex].push(row);
     } else {
-      this.emit('result', row);
+      this.emit('result', row, this._resultIndex);
     }
     return Query.prototype.row;
   }
@@ -268,11 +268,11 @@ class Query extends Command {
     stream._read = () => {
       this._connection && this._connection.resume();
     };
-    this.on('result', row => {
+    this.on('result', (row, resultSetIndex) => {
       if (!stream.push(row)) {
         this._connection.pause();
       }
-      stream.emit('result', row); // replicate old emitter
+      stream.emit('result', row, resultSetIndex); // replicate old emitter
     });
     this.on('error', err => {
       stream.emit('error', err); // Pass on any errors

package/lib/connection_config.js

@@ -65,7 +65,8 @@ const validOptions = {
   idleTimeout: 1,
   Promise: 1,
   queueLimit: 1,
-  waitForConnections: 1
+  waitForConnections: 1,
+  jsonStrings: 1
 };
 
 class ConnectionConfig {
@@ -118,7 +119,7 @@ class ConnectionConfig {
     this.trace = options.trace !== false;
     this.stringifyObjects = options.stringifyObjects || false;
     this.enableKeepAlive = options.enableKeepAlive !== false;
-    this.keepAliveInitialDelay = options.keepAliveInitialDelay || 0;
+    this.keepAliveInitialDelay = options.keepAliveInitialDelay;
     if (
       options.timezone &&
       !/^(?:local|Z|[ +-]\d\d:\d\d)$/.test(options.timezone)
@@ -180,6 +181,7 @@ class ConnectionConfig {
     };
     this.connectAttributes = { ...defaultConnectAttributes, ...(options.connectAttributes || {})};
     this.maxPreparedStatements = options.maxPreparedStatements || 16000;
+    this.jsonStrings = options.jsonStrings || false;
   }
 
   static mergeFlags(default_flags, user_flags) {

package/lib/parsers/binary_parser.js

@@ -59,7 +59,7 @@ function readCodeFor(field, config, options, fieldNum) {
       // Since for JSON columns mysql always returns charset 63 (BINARY),
       // we have to handle it according to JSON specs and use "utf8",
       // see https://github.com/sidorares/node-mysql2/issues/409
-      return 'JSON.parse(packet.readLengthCodedString("utf8"));';
+      return config.jsonStrings ? 'packet.readLengthCodedString("utf8")' : 'JSON.parse(packet.readLengthCodedString("utf8"));';
     case Types.LONGLONG:
       if (!supportBigNumbers) {
         return unsigned

package/lib/parsers/text_parser.js

@@ -63,7 +63,7 @@ function readCodeFor(type, charset, encodingExpr, config, options) {
       // Since for JSON columns mysql always returns charset 63 (BINARY),
       // we have to handle it according to JSON specs and use "utf8",
       // see https://github.com/sidorares/node-mysql2/issues/409
-      return 'JSON.parse(packet.readLengthCodedString("utf8"))';
+      return config.jsonStrings ? 'packet.readLengthCodedString("utf8")' : 'JSON.parse(packet.readLengthCodedString("utf8"))';
     default:
       if (charset === Charsets.BINARY) {
         return 'packet.readLengthCodedBuffer()';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mysql2",
-  "version": "3.9.8",
+  "version": "3.10.0",
   "description": "fast mysql driver. Implements core protocol, prepared statements, ssl and compression in native JS",
   "main": "index.js",
   "typings": "typings/mysql/index",
@@ -12,6 +12,7 @@
     "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:deno": "deno run --allow-read --allow-env --allow-run npm:poku --debug --platform=\"deno\" --deno-allow=\"read,env,net,sys\" --deno-cjs=\".js,.cjs\" --include=\"test/esm,test/unit,test/integration\"",
     "test:tsc-build": "cd \"test/tsc-build\" && npx tsc -p \"tsconfig.json\"",
     "coverage-test": "c8 npm run test",
     "benchmark": "node ./benchmarks/benchmark.js",
@@ -78,9 +79,8 @@
     "eslint-config-prettier": "^9.0.0",
     "eslint-plugin-async-await": "0.0.0",
     "eslint-plugin-markdown": "^5.0.0",
-    "husky": "^9.0.2",
     "lint-staged": "^15.0.1",
-    "poku": "^1.8.1",
+    "poku": "^1.14.0",
     "portfinder": "^1.0.28",
     "prettier": "^3.0.0",
     "progress": "^2.0.3",

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

@@ -326,6 +326,13 @@ export interface ConnectionOptions {
   authPlugins?: {
     [key: string]: AuthPlugin;
   };
+
+  /**
+   * Force JSON to be returned as string
+   *
+   * (Default: false)
+   */
+  jsonStrings?: boolean;
 }
 
 declare class Connection extends QueryableBase(ExecutableBase(EventEmitter)) {