mysql2 3.21.0 → 3.21.1-canary.295264b2

package/lib/packets/packet.js

@@ -155,21 +155,17 @@ class Packet {
   readInt64() {
     const word0 = this.readInt32();
     const word1 = this.readInt32();
-    let res = new Long(word0, word1, true);
+    const res = new Long(word0, word1, true);
     const resNumber = res.toNumber();
-    const resString = res.toString();
-    res = resNumber.toString() === resString ? resNumber : resString;
-    return res;
+    return Number.isSafeInteger(resNumber) ? resNumber : res.toString();
   }
 
   readSInt64() {
     const word0 = this.readInt32();
     const word1 = this.readInt32();
-    let res = new Long(word0, word1, false);
+    const res = new Long(word0, word1, false);
     const resNumber = res.toNumber();
-    const resString = res.toString();
-    res = resNumber.toString() === resString ? resNumber : resString;
-    return res;
+    return Number.isSafeInteger(resNumber) ? resNumber : res.toString();
   }
 
   isEOF() {
@@ -223,8 +219,10 @@ class Packet {
       res = new Long(word0, word1, !signed); // Long need unsigned
       const resNumber = res.toNumber();
       const resString = res.toString();
-      res = resNumber.toString() === resString ? resNumber : resString;
-      return bigNumberStrings ? resString : res;
+      if (bigNumberStrings || !Number.isSafeInteger(resNumber)) {
+        return resString;
+      }
+      return resNumber;
     }
 
     console.trace();
@@ -458,7 +456,7 @@ class Packet {
       if (numDigits >= 15) {
         str = this.readString(end - this.offset, 'binary');
         result = parseInt(str, 10);
-        if (result.toString() === str) {
+        if (Number.isSafeInteger(sign * result)) {
           return sign * result;
         }
         return sign === -1 ? `-${str}` : str;
@@ -480,11 +478,10 @@ class Packet {
     if (!supportBigNumbers) {
       return num;
     }
-    str = this.buffer.toString('ascii', start, end);
-    if (num.toString() === str) {
+    if (Number.isSafeInteger(num)) {
       return num;
     }
-    return str;
+    return this.buffer.toString('ascii', start, end);
   }
 
   // note that if value of inputNumberAsString is bigger than MAX_SAFE_INTEGER

package/package.json

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