Merge branch 'master' into claude/library-performance-analysis-d4d3b6

Conflicts: lib/packets/packet.js
- kept master's ZERO_DATE prefix detection for binary zero dates
  (#4491) but return a fresh new Date(NaN) instead of the shared
  INVALID_DATE singleton, which this branch removed (Date is mutable)
- dropped the now-unused INVALID_DATE constant

Author: sidorares

index.js

@@ -60,6 +60,11 @@ exports.__defineGetter__(
 
 exports.__defineGetter__('Types', () => require('./lib/constants/types.js'));
 
+exports.__defineGetter__(
+  'TypedParameter',
+  () => require('./lib/packets/typed_parameter.js').types
+);
+
 exports.__defineGetter__('Charsets', () =>
   require('./lib/constants/charsets.js')
 );

lib/commands/execute.js

@@ -56,7 +56,8 @@ class Execute extends Command {
       connection.config.timezone,
       this._executeOptions.attributes,
       clientFlags,
-      connection._isMariaDB
+      connection._isMariaDB,
+      this.statement.parameters
     );
     //For reasons why this try-catch is here, please see
     // https://github.com/sidorares/node-mysql2/pull/689

lib/constants/types.js

@@ -18,6 +18,7 @@ module.exports = {
   0x0e: 'NEWDATE', // aka ?
   0x0f: 'VARCHAR', // aka VARCHAR (?)
   0x10: 'BIT', // aka BIT, 1-8 byte
+  0xf2: 'VECTOR',
   0xf5: 'JSON',
   0xf6: 'NEWDECIMAL', // aka DECIMAL
   0xf7: 'ENUM', // aka ENUM

lib/packets/encode_parameter.js

@@ -2,6 +2,12 @@
 
 const Types = require('../constants/types');
 const Packet = require('../packets/packet');
+const {
+  TypedParameter,
+  encodeTypedParameter,
+  integerHint,
+} = require('./typed_parameter.js');
+const FieldFlags = require('../constants/field_flags.js');
 
 function isJSON(value) {
   return (
@@ -11,7 +17,20 @@ function isJSON(value) {
   );
 }
 
-function toParameter(value, encoding, timezone, jsonAsString) {
+function toParameter(value, encoding, timezone, jsonAsString, hint) {
+  if (value instanceof TypedParameter) {
+    return encodeTypedParameter(value, encoding, timezone, jsonAsString);
+  }
+  if (hint) {
+    const hinted = integerHint(
+      value,
+      hint.columnType,
+      Boolean(hint.flags & FieldFlags.UNSIGNED)
+    );
+    if (hinted) {
+      return encodeTypedParameter(hinted, encoding, timezone, jsonAsString);
+    }
+  }
   let type = Types.VAR_STRING;
   let length;
   let writer = function (value) {
@@ -71,7 +90,14 @@ function toParameter(value, encoding, timezone, jsonAsString) {
   if (!length) {
     length = Packet.lengthCodedStringLength(value, encoding);
   }
-  return { value, type, length, writer };
+  return {
+    value,
+    type,
+    length,
+    writer,
+    unsigned: false,
+    isNull: type === Types.NULL,
+  };
 }
 
 module.exports = { toParameter, isJSON };

lib/packets/execute.js

@@ -16,7 +16,8 @@ class Execute {
     timezone,
     attributes,
     clientFlags,
-    jsonAsString
+    jsonAsString,
+    parameterDefinitions
   ) {
     this.id = id;
     this.parameters = parameters;
@@ -25,6 +26,7 @@ class Execute {
     this.attributes = attributes;
     this.clientFlags = clientFlags || 0;
     this.jsonAsString = jsonAsString || false;
+    this.parameterDefinitions = parameterDefinitions || [];
   }
 
   static fromPacket(packet, encoding) {
@@ -124,8 +126,14 @@ class Execute {
     if (totalParams > 0) {
       const bindParams =
         numParams > 0
-          ? this.parameters.map((v) =>
-              toParameter(v, this.encoding, this.timezone, this.jsonAsString)
+          ? this.parameters.map((v, i) =>
+              toParameter(
+                v,
+                this.encoding,
+                this.timezone,
+                this.jsonAsString,
+                this.parameterDefinitions[i]
+              )
             )
           : [];
       const attrParams = attrNames.map((name) =>
@@ -137,7 +145,7 @@ class Execute {
       let bitmap = 0;
       let bitValue = 1;
       allParams.forEach((parameter) => {
-        if (parameter.type === Types.NULL) {
+        if (parameter.isNull) {
           bitmap += bitValue;
         }
         bitValue *= 2;
@@ -156,7 +164,7 @@ class Execute {
       // types (and names for attributes)
       for (let i = 0; i < allParams.length; i++) {
         packet.writeInt8(allParams[i].type);
-        packet.writeInt8(0); // unsigned flag
+        packet.writeInt8(allParams[i].unsigned ? 0x80 : 0);
         if (useQueryAttributes) {
           const name = i < numParams ? '' : attrNames[i - numParams];
           packet.writeLengthCodedString(name, this.encoding);
@@ -165,7 +173,7 @@ class Execute {
 
       // values
       allParams.forEach((parameter) => {
-        if (parameter.type !== Types.NULL) {
+        if (!parameter.isNull) {
           parameter.writer.call(packet, parameter.value);
         }
       });

lib/packets/packet.js

@@ -10,6 +10,7 @@ const NativeBuffer = require('buffer').Buffer;
 const Long = require('long');
 const StringParser = require('../parsers/string.js');
 const Types = require('../constants/types.js');
+const ZERO_DATE = '0000-00-00';
 
 // this is nearly duplicate of previous function so generated code is not slower
 // due to "if (dateStrings)" branching
@@ -337,7 +338,9 @@ class Packet {
       return new Date(y, m - 1, d, H, M, S, ms);
     }
     let str = this.readDateTimeString(6, 'T', null);
-    if (!str) {
+    if (str.startsWith(ZERO_DATE)) {
+      // fresh instance: Date is mutable, a shared invalid-date singleton
+      // could be corrupted by callers (see the parseDateTime tests)
       return new Date(NaN);
     }
     if (str.length === 10) {
@@ -355,7 +358,7 @@ class Packet {
     let M = 0;
     let S = 0;
     let ms = 0;
-    let str;
+    let str = ZERO_DATE;
     if (length > 3) {
       y = this.readInt16();
       m = this.readInt8();
@@ -948,6 +951,36 @@ class Packet {
     this.offset += 8;
   }
 
+  writeFloat(n) {
+    this.buffer.writeFloatLE(n, this.offset);
+    this.offset += 4;
+  }
+
+  writeUIntLE(n, bytes) {
+    if (bytes === 8) {
+      this.buffer.writeBigUInt64LE(n, this.offset);
+    } else {
+      this.buffer.writeUIntLE(Number(n), this.offset, bytes);
+    }
+    this.offset += bytes;
+  }
+
+  writeTime({ negative, days, hours, minutes, seconds, microseconds }) {
+    if (!days && !hours && !minutes && !seconds && !microseconds) {
+      this.writeInt8(0);
+      return;
+    }
+    this.writeInt8(microseconds ? 12 : 8);
+    this.writeInt8(negative ? 1 : 0);
+    this.writeInt32(days);
+    this.writeInt8(hours);
+    this.writeInt8(minutes);
+    this.writeInt8(seconds);
+    if (microseconds) {
+      this.writeInt32(microseconds);
+    }
+  }
+
   writeBuffer(b) {
     b.copy(this.buffer, this.offset);
     this.offset += b.length;