@depup/mysql2 3.22.0-depup.0 → 3.23.2-depup.0

package/README.md

@@ -13,10 +13,16 @@ npm install @depup/mysql2
 
 | Field | Value |
 |-------|-------|
-| Original | [mysql2](https://www.npmjs.com/package/mysql2) @ 3.22.0 |
-| Processed | 2026-04-10 |
+| Original | [mysql2](https://www.npmjs.com/package/mysql2) @ 3.23.2 |
+| Processed | 2026-07-27 |
 | Smoke test | passed |
-| Deps updated | 0 |
+| Deps updated | 1 |
+
+## Dependency Changes
+
+| Dependency | From | To |
+|------------|------|-----|
+| iconv-lite | ^0.7.2 | ^0.7.3 |
 
 ---
 

package/changes.json

@@ -1,5 +1,10 @@
 {
-  "bumped": {},
-  "timestamp": "2026-04-10T16:28:10.975Z",
-  "totalUpdated": 0
+  "bumped": {
+    "iconv-lite": {
+      "from": "^0.7.2",
+      "to": "^0.7.3"
+    }
+  },
+  "timestamp": "2026-07-27T16:45:19.802Z",
+  "totalUpdated": 1
 }

package/lib/base/connection.js

@@ -87,6 +87,8 @@ class BaseConnection extends EventEmitter {
       },
     });
     this.serverCapabilityFlags = 0;
+    this._isMariaDB = false;
+    this._mariadbExtendedMetadata = false;
     this.authorized = false;
     this.sequenceId = 0;
     this.compressedSequenceId = 0;
@@ -186,7 +188,7 @@ class BaseConnection extends EventEmitter {
         });
       }
     }
-    // in case there was no initial handshake but we need to read sting, assume it utf-8
+    // in case there was no initial handshake but we need to read string, assume it utf-8
     // most common example: "Too many connections" error ( packet is sent immediately on connection attempt, we don't know server encoding yet)
     // will be overwritten with actual encoding value as soon as server handshake packet is received
     this.serverEncoding = 'utf8';
@@ -285,7 +287,7 @@ class BaseConnection extends EventEmitter {
         bubbleErrorToConnection = true;
       }
     }
-    // notify connection if some comands in the queue did not have callbacks
+    // notify connection if some commands in the queue did not have callbacks
     // or if this is pool connection ( so it can be removed from pool )
     if (bubbleErrorToConnection || this._pool) {
       this.emit('error', err);

package/lib/base/pool.js

@@ -185,6 +185,10 @@ class BasePool extends EventEmitter {
         }
       };
     }
+    while (this._connectionQueue.length > 0) {
+      const queuedCallback = this._connectionQueue.shift();
+      process.nextTick(() => queuedCallback(new Error('Pool is closed.')));
+    }
     let calledBack = false;
     let closedConnections = 0;
     let connection;

package/lib/commands/client_handshake.js

@@ -1,5 +1,5 @@
 // This file was modified by Oracle on June 17, 2021.
-// Handshake errors are now maked as fatal and the corresponding events are
+// Handshake errors are now marked as fatal and the corresponding events are
 // emitted in the command instance itself.
 // Modifications copyright (c) 2021, Oracle and/or its affiliates.
 
@@ -13,6 +13,7 @@
 const Command = require('./command.js');
 const Packets = require('../packets/index.js');
 const ClientConstants = require('../constants/client.js');
+const MariaDBClientConstants = require('../constants/mariadb_client.js');
 const CharsetToEncoding = require('../constants/charset_encodings.js');
 const auth41 = require('../auth_41.js');
 const { getAuthPlugin } = require('./auth_switch.js');
@@ -35,6 +36,7 @@ class ClientHandshake extends Command {
     super();
     this.handshake = null;
     this.clientFlags = clientFlags;
+    this.mariadbExtendedClientFlags = 0;
     this.authenticationFactor = 0;
   }
 
@@ -45,7 +47,8 @@ class ClientHandshake extends Command {
   sendSSLRequest(connection) {
     const sslRequest = new Packets.SSLRequest(
       this.clientFlags,
-      connection.config.charsetNumber
+      connection.config.charsetNumber,
+      this.mariadbExtendedClientFlags
     );
     connection.writePacket(sslRequest.toPacket());
   }
@@ -130,6 +133,7 @@ class ClientHandshake extends Command {
 
     const handshakeResponse = new Packets.HandshakeResponse({
       flags: this.clientFlags,
+      mariadbExtendedClientFlags: this.mariadbExtendedClientFlags,
       user: this.user,
       database: this.database,
       password: this.password,
@@ -265,6 +269,26 @@ class ClientHandshake extends Command {
     connection.serverCapabilityFlags = this.handshake.capabilityFlags;
     connection.serverEncoding = CharsetToEncoding[this.handshake.characterSet];
     connection.connectionId = this.handshake.connectionId;
+    // MariaDB needs a few protocol deviations, e.g. it rejects the JSON
+    // parameter type in COM_STMT_EXECUTE
+    connection._isMariaDB = /mariadb/i.test(this.handshake.serverVersion);
+    // If a MariaDB server offers extended column metadata, request it so
+    // MariaDB-specific column types (UUID, INET4, INET6, VECTOR and the JSON
+    // alias) can be identified. The server only reads the extended client
+    // capability bytes when the client leaves CLIENT_MYSQL (LONG_PASSWORD)
+    // unset, mirroring the server side of the negotiation.
+    if (
+      this.handshake.mariadbExtendedCapabilityFlags &
+      MariaDBClientConstants.MARIADB_CLIENT_EXTENDED_METADATA
+    ) {
+      this.clientFlags &= ~ClientConstants.LONG_PASSWORD;
+      this.mariadbExtendedClientFlags |=
+        MariaDBClientConstants.MARIADB_CLIENT_EXTENDED_METADATA;
+    }
+    connection._mariadbExtendedMetadata = Boolean(
+      this.mariadbExtendedClientFlags &
+      MariaDBClientConstants.MARIADB_CLIENT_EXTENDED_METADATA
+    );
     const serverSSLSupport =
       this.handshake.capabilityFlags & ClientConstants.SSL;
     // multi factor authentication is enabled with the

package/lib/commands/execute.js

@@ -1,5 +1,7 @@
 'use strict';
 
+const Timers = require('timers');
+
 const Command = require('./command.js');
 const Query = require('./query.js');
 const Packets = require('../packets/index.js');
@@ -51,7 +53,8 @@ class Execute extends Command {
       connection.config.charsetNumber,
       connection.config.timezone,
       this._executeOptions.attributes,
-      clientFlags
+      clientFlags,
+      connection._isMariaDB
     );
     //For reasons why this try-catch is here, please see
     // https://github.com/sidorares/node-mysql2/pull/689
@@ -62,7 +65,16 @@ class Execute extends Command {
     try {
       connection.writePacket(executePacket.toPacket(1));
     } catch (error) {
-      this.onResult(error);
+      if (this.queryTimeout) {
+        Timers.clearTimeout(this.queryTimeout);
+        this.queryTimeout = null;
+      }
+      if (this.onResult) {
+        this.onResult(error);
+      } else {
+        this.emit('error', error);
+      }
+      return null;
     }
     return Execute.prototype.resultsetHeader;
   }
@@ -72,12 +84,13 @@ class Execute extends Command {
     // disabling for now, but would be great to find reliable way to parse fields only once
     // fields reported by prepare can be empty at all or just incorrect - see #169
     //
-    // perfomance optimisation: if we already have this field parsed in statement header, use one from header
+    // performance optimisation: if we already have this field parsed in statement header, use one from header
     // const field = this.statement.columns.length == this._fieldCount ?
     //  this.statement.columns[this._receivedFieldsCount] : new Packets.ColumnDefinition(packet);
     const field = new Packets.ColumnDefinition(
       packet,
-      connection.clientEncoding
+      connection.clientEncoding,
+      connection._mariadbExtendedMetadata
     );
     this._receivedFieldsCount++;
     this._fields[this._resultIndex].push(field);

package/lib/commands/ping.js

@@ -5,7 +5,7 @@ const CommandCode = require('../constants/commands');
 const Packet = require('../packets/packet');
 
 // TODO: time statistics?
-// usefull for queue size and network latency monitoring
+// useful for queue size and network latency monitoring
 // store created,sent,reply timestamps
 class Ping extends Command {
   constructor(callback) {

package/lib/commands/prepare.js

@@ -87,7 +87,11 @@ class Prepare extends Command {
       }
       return this.prepareDone(connection);
     }
-    const def = new Packets.ColumnDefinition(packet, connection.clientEncoding);
+    const def = new Packets.ColumnDefinition(
+      packet,
+      connection.clientEncoding,
+      connection._mariadbExtendedMetadata
+    );
     this.parameterDefinitions.push(def);
     if (this.parameterDefinitions.length === this.parameterCount) {
       return Prepare.prototype.parametersEOF;
@@ -99,7 +103,11 @@ class Prepare extends Command {
     if (packet.isEOF()) {
       return this.prepareDone(connection);
     }
-    const def = new Packets.ColumnDefinition(packet, connection.clientEncoding);
+    const def = new Packets.ColumnDefinition(
+      packet,
+      connection.clientEncoding,
+      connection._mariadbExtendedMetadata
+    );
     this.fields.push(def);
     if (this.fields.length === this.fieldCount) {
       return Prepare.prototype.fieldsEOF;

package/lib/commands/query.js

@@ -199,7 +199,8 @@ class Query extends Command {
     if (this._fields[this._resultIndex].length !== this._fieldCount) {
       const field = new Packets.ColumnDefinition(
         packet,
-        connection.clientEncoding
+        connection.clientEncoding,
+        connection._mariadbExtendedMetadata
       );
       this._fields[this._resultIndex].push(field);
       if (connection.config.debug) {

package/lib/compressed_protocol.js

@@ -40,7 +40,7 @@ function handleCompressedPacket(packet) {
 
   if (deflatedLength !== 0) {
     connection.inflateQueue.push((task) => {
-      zlib.inflate(body, (err, data) => {
+      zlib.inflate(body, { maxOutputLength: deflatedLength }, (err, data) => {
         if (err) {
           connection._handleNetworkError(err);
           return;

package/lib/connection_config.js

@@ -67,6 +67,7 @@ const validOptions = {
   idleTimeout: 1,
   Promise: 1,
   queueLimit: 1,
+  resetOnRelease: 1,
   waitForConnections: 1,
   jsonStrings: 1,
   gracefulEnd: 1,

package/lib/constants/charset_encodings.js

@@ -3,7 +3,7 @@
 // see tools/generate-charset-mapping.js
 // basicalliy result of "SHOW COLLATION" query
 
-module.exports = [
+const encodings = [
   'utf8',
   'big5',
   'latin2',
@@ -315,3 +315,27 @@ module.exports = [
   'utf8',
   'utf8',
 ];
+
+// MariaDB NO PAD collations mirror their PAD SPACE counterparts:
+// collation id = PAD SPACE collation id + 1024
+const padSpaceLength = encodings.length;
+for (let id = 1025; id < 1024 + padSpaceLength; id++) {
+  encodings[id] = encodings[id - 1024];
+}
+
+// MariaDB UCA-14.0.0 (uca1400) collations use fixed 256-id blocks
+// per character set, each covering the PAD SPACE and NO PAD variants
+const uca1400Blocks = [
+  [2048, 'cesu8'], // utf8mb3
+  [2304, 'utf8'], // utf8mb4
+  [2560, 'ucs2'], // ucs2
+  [2816, 'utf16'], // utf16
+  [3072, 'utf32'], // utf32
+];
+for (const [start, encoding] of uca1400Blocks) {
+  for (let id = start; id < start + 256; id++) {
+    encodings[id] = encoding;
+  }
+}
+
+module.exports = encodings;

package/lib/constants/mariadb_client.js

@@ -0,0 +1,19 @@
+'use strict';
+
+// MariaDB-specific extended capability flags.
+//
+// MariaDB servers (10.2+) do not set the CLIENT_MYSQL (LONG_PASSWORD)
+// capability and instead use 4 reserved bytes of the initial handshake packet
+// to advertise these flags. Clients answer with their own extended
+// capabilities in the last 4 reserved bytes of the handshake response
+// (the server only reads them when the client leaves CLIENT_MYSQL unset).
+//
+// The flags below are the lower 32 bits shifted down, i.e.
+// MARIADB_CLIENT_PROGRESS is documented as 1 << 32.
+// https://mariadb.com/docs/server/reference/clientserver-protocol/1-connecting/connection
+exports.MARIADB_CLIENT_PROGRESS = 0x00000001;
+exports.MARIADB_CLIENT_COM_MULTI = 0x00000002; /* deprecated */
+exports.MARIADB_CLIENT_STMT_BULK_OPERATIONS = 0x00000004;
+exports.MARIADB_CLIENT_EXTENDED_METADATA = 0x00000008;
+exports.MARIADB_CLIENT_CACHE_METADATA = 0x00000010;
+exports.MARIADB_CLIENT_BULK_UNIT_RESULTS = 0x00000020;

package/lib/packets/binary_row.js

@@ -12,7 +12,7 @@ class BinaryRow {
 
   static toPacket(columns, encoding) {
     // throw new Error('Not implemented');
-    const sequenceId = 0; // TODO remove, this is calculated now in connecton
+    const sequenceId = 0; // TODO remove, this is calculated now in connection
     let length = 0;
     columns.forEach((val) => {
       if (val === null || typeof val === 'undefined') {
@@ -82,7 +82,7 @@ binaryReader[2] = Packet.prototype.readInt16; // short
 binaryReader[3] = Packet.prototype.readInt32; // long
 binaryReader[4] = Packet.prototype.readFloat; // float
 binaryReader[5] = Packet.prototype.readDouble; // double
-binaryReader[6] = Packet.prototype.assertInvalid; // null, should be skipped vie null bitmap
+binaryReader[6] = Packet.prototype.assertInvalid; // null, should be skipped via null bitmap
 binaryReader[7] = Packet.prototype.readTimestamp; // timestamp, http://dev.mysql.com/doc/internals/en/prepared-statements.html#packet-ProtocolBinary::MYSQL_TYPE_TIMESTAMP
 binaryReader[8] = Packet.prototype.readInt64; // long long
 binaryReader[9] = Packet.prototype.readInt32; // int24

package/lib/packets/binlog_query_statusvars.js

@@ -31,7 +31,7 @@ module.exports = function parseStatusVars(buffer) {
         offset += 4;
         break;
       case keys.SQL_MODE:
-        // value is 8 bytes, but all dcumented flags are in first 4 bytes
+        // value is 8 bytes, but all documented flags are in first 4 bytes
         result.sqlMode = buffer.readUInt32LE(offset);
         offset += 8;
         break;

package/lib/packets/change_user.js

@@ -16,7 +16,7 @@ class ChangeUser {
     this.passwordSha1 = opts.passwordSha1;
     this.authPluginData1 = opts.authPluginData1;
     this.authPluginData2 = opts.authPluginData2;
-    this.connectAttributes = opts.connectAttrinutes || {};
+    this.connectAttributes = opts.connectAttributes || {};
     let authToken;
     if (this.passwordSha1) {
       authToken = auth41.calculateTokenFromPasswordSha(

package/lib/packets/column_definition.js

@@ -19,7 +19,7 @@ const fields = ['catalog', 'schema', 'table', 'orgTable', 'name', 'orgName'];
 // see https://github.com/sidorares/node-mysql2/pull/137
 //
 class ColumnDefinition {
-  constructor(packet, clientEncoding) {
+  constructor(packet, clientEncoding, mariadbExtendedMetadata) {
     this._buf = packet.buffer;
     this._clientEncoding = clientEncoding;
     this._catalogLength = packet.readLengthCodedNumber();
@@ -41,6 +41,14 @@ class ColumnDefinition {
     this._orgNameLength = packet.readLengthCodedNumber();
     this._orgNameStart = packet.offset;
     packet.offset += this._orgNameLength;
+    // MariaDB-specific column types (UUID, INET4, INET6, VECTOR and the JSON
+    // alias) are sent as standard string/blob types on the wire; the real
+    // type is only visible here, in the extended metadata block negotiated
+    // via the MARIADB_CLIENT_EXTENDED_METADATA capability (parsed out of
+    // line and with prototype defaults to keep this hot constructor small)
+    if (mariadbExtendedMetadata) {
+      this._parseMariadbExtendedMetadata(packet);
+    }
     packet.skip(1); //  length of the following fields (always 0x0c)
     this.characterSet = packet.readInt16();
     this.encoding = CharsetToEncoding[this.characterSet];
@@ -57,6 +65,27 @@ class ColumnDefinition {
     this.decimals = packet.readInt8();
   }
 
+  _parseMariadbExtendedMetadata(packet) {
+    // length-encoded block of { int<1> id, string<lenenc> value } pairs
+    const extendedMetadataLength = packet.readLengthCodedNumber() || 0;
+    const extendedMetadataEnd = Math.min(
+      packet.offset + extendedMetadataLength,
+      packet.end
+    );
+    while (packet.offset < extendedMetadataEnd) {
+      const id = packet.readInt8();
+      const value = packet.readLengthCodedString('ascii');
+      if (id === 0) {
+        this.extendedTypeName = value; // e.g. 'uuid', 'inet4', 'inet6', 'point'
+      } else if (id === 1) {
+        this.extendedFormat = value; // e.g. 'json'
+      }
+    }
+    // a malformed entry could read past the block; resynchronise so the
+    // fixed column definition fields that follow parse from the right offset
+    packet.offset = extendedMetadataEnd;
+  }
+
   inspect() {
     return {
       catalog: this.catalog,
@@ -288,4 +317,9 @@ addString('table');
 addString('orgTable');
 addString('orgName');
 
+// MariaDB extended metadata defaults; instances only carry own values when
+// the server actually tagged the column
+ColumnDefinition.prototype.extendedTypeName = undefined;
+ColumnDefinition.prototype.extendedFormat = undefined;
+
 module.exports = ColumnDefinition;

package/lib/packets/encode_parameter.js

@@ -11,7 +11,7 @@ function isJSON(value) {
   );
 }
 
-function toParameter(value, encoding, timezone) {
+function toParameter(value, encoding, timezone, jsonAsString) {
   let type = Types.VAR_STRING;
   let length;
   let writer = function (value) {
@@ -46,8 +46,18 @@ function toParameter(value, encoding, timezone) {
           };
         } else if (isJSON(value)) {
           value = JSON.stringify(value);
-          type = Types.JSON;
+          // MariaDB rejects the JSON parameter type with "Incorrect
+          // arguments to mysqld_stmt_execute"; it expects JSON values
+          // as plain strings
+          if (!jsonAsString) {
+            type = Types.JSON;
+          }
         } else if (Buffer.isBuffer(value)) {
+          // send buffers as BLOB so servers treat the value as binary data
+          // rather than a string in the connection charset (MariaDB converts
+          // string parameters when storing into binary columns such as
+          // VECTOR, corrupting the value)
+          type = Types.BLOB;
           length = Packet.lengthCodedNumberLength(value.length) + value.length;
           writer = Packet.prototype.writeLengthCodedBuffer;
         }

package/lib/packets/execute.js

@@ -15,7 +15,8 @@ class Execute {
     charsetNumber,
     timezone,
     attributes,
-    clientFlags
+    clientFlags,
+    jsonAsString
   ) {
     this.id = id;
     this.parameters = parameters;
@@ -23,6 +24,7 @@ class Execute {
     this.timezone = timezone;
     this.attributes = attributes;
     this.clientFlags = clientFlags || 0;
+    this.jsonAsString = jsonAsString || false;
   }
 
   static fromPacket(packet, encoding) {
@@ -34,6 +36,7 @@ class Execute {
     while (i < packet.end - 1) {
       if (
         (packet.buffer[i + 1] === Types.VAR_STRING ||
+          packet.buffer[i + 1] === Types.BLOB ||
           packet.buffer[i + 1] === Types.NULL ||
           packet.buffer[i + 1] === Types.DOUBLE ||
           packet.buffer[i + 1] === Types.TINY ||
@@ -54,6 +57,7 @@ class Execute {
     for (let i = packet.offset + 1; i < packet.end - 1; i++) {
       if (
         (packet.buffer[i] === Types.VAR_STRING ||
+          packet.buffer[i] === Types.BLOB ||
           packet.buffer[i] === Types.NULL ||
           packet.buffer[i] === Types.DOUBLE ||
           packet.buffer[i] === Types.TINY ||
@@ -72,6 +76,8 @@ class Execute {
     for (let i = 0; i < types.length; i++) {
       if (types[i] === Types.VAR_STRING) {
         values.push(packet.readLengthCodedString(encoding));
+      } else if (types[i] === Types.BLOB) {
+        values.push(packet.readLengthCodedBuffer());
       } else if (types[i] === Types.DOUBLE) {
         values.push(packet.readDouble());
       } else if (types[i] === Types.TINY) {
@@ -119,7 +125,7 @@ class Execute {
       const bindParams =
         numParams > 0
           ? this.parameters.map((v) =>
-              toParameter(v, this.encoding, this.timezone)
+              toParameter(v, this.encoding, this.timezone, this.jsonAsString)
             )
           : [];
       const attrParams = attrNames.map((name) =>

package/lib/packets/handshake.js

@@ -16,6 +16,7 @@ class Handshake {
     this.characterSet = args.characterSet;
     this.statusFlags = args.statusFlags;
     this.authPluginName = args.authPluginName;
+    this.mariadbExtendedCapabilityFlags = args.mariadbExtendedCapabilityFlags;
   }
 
   setScrambleData(cb) {
@@ -79,9 +80,20 @@ class Handshake {
         args.authPluginDataLength = 0;
         packet.skip(1);
       }
-      packet.skip(10);
+      packet.skip(6);
+      if (args.capabilityFlags & ClientConstants.LONG_PASSWORD) {
+        // CLIENT_MYSQL (LONG_PASSWORD) set: a MySQL server, the remaining
+        // 4 reserved bytes are filler
+        packet.skip(4);
+        args.mariadbExtendedCapabilityFlags = 0;
+      } else {
+        // MariaDB servers (10.2+) leave CLIENT_MYSQL unset and use these
+        // 4 bytes to advertise MariaDB-specific capabilities
+        args.mariadbExtendedCapabilityFlags = packet.readInt32();
+      }
     } else {
       args.capabilityFlags = capabilityFlagsBuffer.readUInt16LE(0);
+      args.mariadbExtendedCapabilityFlags = 0;
     }
 
     const isSecureConnection =

package/lib/packets/handshake_response.js

@@ -16,6 +16,7 @@ class HandshakeResponse {
     this.authPluginData2 = handshake.authPluginData2;
     this.compress = handshake.compress;
     this.clientFlags = handshake.flags;
+    this.mariadbExtendedClientFlags = handshake.mariadbExtendedClientFlags || 0;
 
     // Accept pre-calculated authToken and authPluginName from caller
     // This allows the caller to optimize by using the server's preferred auth method
@@ -69,7 +70,10 @@ class HandshakeResponse {
     packet.writeInt32(this.clientFlags);
     packet.writeInt32(0); // max packet size. todo: move to config
     packet.writeInt8(this.charsetNumber);
-    packet.skip(23);
+    // the last 4 of the 23 reserved bytes carry the MariaDB extended client
+    // capabilities (zero when not negotiated, i.e. plain filler)
+    packet.skip(19);
+    packet.writeInt32(this.mariadbExtendedClientFlags);
     const encoding = this.encoding;
     packet.writeNullTerminatedString(this.user, encoding);
     let k;

package/lib/packets/packet.js

@@ -32,13 +32,40 @@ function leftPad(num, value) {
 // In my benchmarks the difference is ~25M 8-digit numbers per second vs
 // 4.5 M using Number(packet.readLengthCodedString())
 // not used when size is close to max precision as series of *10 accumulate error
-// and approximate result mihgt be diffreent from (approximate as well) Number(bigNumStringValue))
-// In the futire node version if speed difference is smaller parse* functions might be removed
+// and approximate result might be different from (approximate as well) Number(bigNumStringValue))
+// In the future node version if speed difference is smaller parse* functions might be removed
 // don't consider them as Packet public API
 
 const minus = '-'.charCodeAt(0);
 const plus = '+'.charCodeAt(0);
 
+// JSON.parse source access: proposal-json-parse-with-source,
+// Node.js 22+ / V8 12.2
+const jsonSourceAccessSupported = (() => {
+  let supported = false;
+  JSON.parse('0', (key, value, context) => {
+    supported = context !== undefined && typeof context.source === 'string';
+    return value;
+  });
+  return supported;
+})();
+
+// 16 digits is the shortest numeral that can exceed Number.MAX_SAFE_INTEGER
+const jsonBigNumeral = /\d{16}/;
+const jsonIntegerSource = /^-?\d+$/;
+
+function jsonBigNumberReviver(key, value, context) {
+  if (
+    typeof value === 'number' &&
+    !Number.isSafeInteger(value) &&
+    context !== undefined &&
+    jsonIntegerSource.test(context.source)
+  ) {
+    return context.source;
+  }
+  return value;
+}
+
 // TODO: handle E notation
 const dot = '.'.charCodeAt(0);
 const exponent = 'e'.charCodeAt(0);
@@ -290,6 +317,9 @@ class Packet {
       return new Date(y, m - 1, d, H, M, S, ms);
     }
     let str = this.readDateTimeString(6, 'T', null);
+    if (!str) {
+      return INVALID_DATE;
+    }
     if (str.length === 10) {
       str += 'T00:00:00';
     }
@@ -321,7 +351,10 @@ class Packet {
         leftPad(2, M),
         leftPad(2, S),
       ].join(':')}`;
-    } else if (columnType === Types.DATETIME) {
+    } else if (
+      columnType === Types.DATETIME ||
+      columnType === Types.TIMESTAMP
+    ) {
       str += ' 00:00:00';
     }
     if (length > 10) {
@@ -648,6 +681,21 @@ class Packet {
     return result;
   }
 
+  // With supportBigNumbers, unsafe integers become exact strings,
+  // mirroring the option's behaviour for BIGINT columns
+  parseJson(encoding, supportBigNumbers) {
+    const str = this.readLengthCodedString(encoding);
+    if (
+      supportBigNumbers &&
+      jsonSourceAccessSupported &&
+      str !== null &&
+      jsonBigNumeral.test(str)
+    ) {
+      return JSON.parse(str, jsonBigNumberReviver);
+    }
+    return JSON.parse(str);
+  }
+
   parseDate(timezone) {
     const strLen = this.readLengthCodedNumber();
     if (strLen === null) {

package/lib/packets/resultset_header.js

@@ -65,7 +65,7 @@ class ResultSetHeader {
             if (key === 'character_set_client') {
               const charsetNumber = EncodingToCharset[val];
               // TODO - better api for driver users to handle unknown encodings?
-              // maybe custom coverter in the config?
+              // maybe custom converter in the config?
               // For now just ignore character_set_client command if there is
               // no known mapping from reported encoding to a charset code
               if (typeof charsetNumber !== 'undefined') {