mysql2 3.23.0 → 3.23.1-canary.01f1092

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/parsers/binary_parser.js

@@ -96,7 +96,7 @@ function compile(fields, options, config) {
   const parserFn = genFunc();
   const nullBitmapLength = Math.floor((fields.length + 7 + 2) / 8);
 
-  function wrap(field, packet) {
+  function fieldMetadata(field) {
     return {
       type: typeNames[field.columnType],
       extendedTypeName: field.extendedTypeName,
@@ -105,6 +105,12 @@ function compile(fields, options, config) {
       db: field.schema,
       table: field.table,
       name: field.name,
+    };
+  }
+
+  function wrap(field, packet) {
+    return {
+      ...fieldMetadata(field),
       string: function (encoding = field.encoding) {
         if (field.columnType === Types.JSON && encoding === field.encoding) {
           // Since for JSON columns mysql always returns charset 63 (BINARY),
@@ -148,6 +154,22 @@ function compile(fields, options, config) {
     };
   }
 
+  /** A NULL value carries no bytes in the binary row packet, so the accessors return null without reading from it. */
+  function wrapNull(field) {
+    return {
+      ...fieldMetadata(field),
+      string: function () {
+        return null;
+      },
+      buffer: function () {
+        return null;
+      },
+      geometry: function () {
+        return null;
+      },
+    };
+  }
+
   parserFn('(function(){');
   parserFn('return class BinaryRow {');
   parserFn('constructor() {');
@@ -196,9 +218,17 @@ function compile(fields, options, config) {
       lvalue = `result[${fieldName}]`;
     }
 
-    parserFn(`if (nullBitmaskByte${nullByteIndex} & ${currentFieldNullBit}) `);
-    parserFn(`${lvalue} = null;`);
-    parserFn('else {');
+    parserFn(`if (nullBitmaskByte${nullByteIndex} & ${currentFieldNullBit}) {`);
+    if (typeof options.typeCast === 'function') {
+      const nullWrapperVar = `nullWrapper${i}`;
+      parserFn(`const ${nullWrapperVar} = wrapNull(fields[${i}]);`);
+      parserFn(
+        `${lvalue} = options.typeCast(${nullWrapperVar}, function() { return null; });`
+      );
+    } else {
+      parserFn(`${lvalue} = null;`);
+    }
+    parserFn('} else {');
 
     if (options.typeCast === false) {
       parserFn(`${lvalue} = packet.readLengthCodedBuffer();`);
@@ -234,7 +264,7 @@ function compile(fields, options, config) {
       parserFn.toString()
     );
   }
-  return parserFn.toFunction({ wrap });
+  return parserFn.toFunction({ wrap, wrapNull });
 }
 
 function getBinaryParser(fields, options, config) {

package/lib/parsers/static_binary_parser.js

@@ -94,6 +94,28 @@ function getBinaryParser(fields, _options, config) {
     }
   }
 
+  /** A NULL value carries no bytes in the binary row packet, so the accessors return null without reading from it. */
+  function wrapNull(field) {
+    return {
+      type: typeNames[field.columnType],
+      extendedTypeName: field.extendedTypeName,
+      extendedFormat: field.extendedFormat,
+      length: field.columnLength,
+      db: field.schema,
+      table: field.table,
+      name: field.name,
+      string: function () {
+        return null;
+      },
+      buffer: function () {
+        return null;
+      },
+      geometry: function () {
+        return null;
+      },
+    };
+  }
+
   return class BinaryRow {
     constructor() {}
 
@@ -118,7 +140,10 @@ function getBinaryParser(fields, _options, config) {
 
         let value;
         if (nullBitmaskBytes[nullByteIndex] & currentFieldNullBit) {
-          value = null;
+          value =
+            typeof typeCast === 'function'
+              ? typeCast(wrapNull(field), () => null)
+              : null;
         } else if (options.typeCast === false) {
           value = packet.readLengthCodedBuffer();
         } else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mysql2",
-  "version": "3.23.0",
+  "version": "3.23.1-canary.01f1092",
   "description": "fast mysql driver. Implements core protocol, prepared statements, ssl and compression in native JS",
   "main": "index.js",
   "typings": "typings/mysql/index",