misc - 2.5.6 correction merge

mariadb-corporation · Jan 24, 2022 · 3cd34b8 · 3cd34b8
1 parent c7e12e1
commit 3cd34b8
Show file tree

Hide file tree

Showing 12 changed files with 26 additions and 53 deletions.
diff --git a/lib/cmd/column-definition.js b/lib/cmd/column-definition.js
@@ -151,7 +151,7 @@ class ColumnDef {
         case FieldType.JSON:
           //for mysql only => parse string as JSON object
           return (packet, index, nullBitmap, opts) =>
-            isNullBitmap(index, nullBitmap) ? null : JSON.parse(packet.readStringLength());
+            isNullBitmap(index, nullBitmap) ? null : JSON.parse(packet.readStringLengthEncoded());
 
         case FieldType.BIT:
           if (this.columnLength === 1 && opts.bitOneIsBoolean) {
@@ -164,7 +164,7 @@ class ColumnDef {
         default:
           if (this.dataTypeFormat && this.dataTypeFormat === 'json' && opts.autoJsonMap) {
             return (packet, index, nullBitmap, opts) =>
-              isNullBitmap(index, nullBitmap) ? null : JSON.parse(packet.readStringLength());
+              isNullBitmap(index, nullBitmap) ? null : JSON.parse(packet.readStringLengthEncoded());
           }
 
           if (this.collation.index === 63) {
@@ -175,12 +175,12 @@ class ColumnDef {
           if (this.isSet()) {
             return (packet, index, nullBitmap, opts) => {
               if (isNullBitmap(index, nullBitmap)) return null;
-              const string = packet.readStringLength();
+              const string = packet.readStringLengthEncoded();
               return string == null ? null : string === '' ? [] : string.split(',');
             };
           }
           return (packet, index, nullBitmap, opts) =>
-            isNullBitmap(index, nullBitmap) ? null : packet.readStringLength();
+            isNullBitmap(index, nullBitmap) ? null : packet.readStringLengthEncoded();
       }
     } else {
       switch (this.columnType) {
@@ -246,7 +246,7 @@ class ColumnDef {
 
         case FieldType.JSON:
           //for mysql only => parse string as JSON object
-          return (packet, index, nullBitmap, opts) => JSON.parse(packet.readStringLength());
+          return (packet, index, nullBitmap, opts) => JSON.parse(packet.readStringLengthEncoded());
 
         case FieldType.BIT:
           if (this.columnLength === 1 && opts.bitOneIsBoolean) {
@@ -259,7 +259,7 @@ class ColumnDef {
 
         default:
           if (this.dataTypeFormat && this.dataTypeFormat === 'json' && opts.autoJsonMap) {
-            return (packet, index, nullBitmap, opts) => JSON.parse(packet.readStringLength());
+            return (packet, index, nullBitmap, opts) => JSON.parse(packet.readStringLengthEncoded());
           }
 
           if (this.collation.index === 63) {
@@ -268,11 +268,11 @@ class ColumnDef {
 
           if (this.isSet()) {
             return (packet, index, nullBitmap, opts) => {
-              const string = packet.readStringLength();
+              const string = packet.readStringLengthEncoded();
               return string == null ? null : string === '' ? [] : string.split(',');
             };
           }
-          return (packet, index, nullBitmap, opts) => packet.readStringLength();
+          return (packet, index, nullBitmap, opts) => packet.readStringLengthEncoded();
       }
     }
   }

diff --git a/lib/cmd/command.js b/lib/cmd/command.js
@@ -129,8 +129,8 @@ class Command extends EventEmitter {
           switch (type) {
             case StateChange.SESSION_TRACK_SYSTEM_VARIABLES:
               const subSubPacket = subPacket.subPacketLengthEncoded();
-              const variable = subSubPacket.readStringLength();
-              const value = subSubPacket.readStringLength();
+              const variable = subSubPacket.readStringLengthEncoded();
+              const value = subSubPacket.readStringLengthEncoded();
 
               switch (variable) {
                 case 'character_set_client':
@@ -149,7 +149,7 @@ class Command extends EventEmitter {
 
             case StateChange.SESSION_TRACK_SCHEMA:
               const subSubPacket2 = subPacket.subPacketLengthEncoded();
-              info.database = subSubPacket2.readStringLength();
+              info.database = subSubPacket2.readStringLengthEncoded();
               break;
           }
         }

diff --git a/lib/cmd/decoder/binary-decoder.js b/lib/cmd/decoder/binary-decoder.js
@@ -7,7 +7,7 @@ class BinaryDecoder {
   }
 
   static castWrapper(column, packet, index, nullBitmap, opts) {
-    column.string = () => (isNullBitmap(index, nullBitmap) ? null : packet.readStringLength());
+    column.string = () => (isNullBitmap(index, nullBitmap) ? null : packet.readStringLengthEncoded());
     column.buffer = () => (isNullBitmap(index, nullBitmap) ? null : packet.readBufferLengthEncoded());
     column.float = () => (isNullBitmap(index, nullBitmap) ? null : packet.readFloat());
     column.tiny = () =>

diff --git a/lib/cmd/decoder/text-decoder.js b/lib/cmd/decoder/text-decoder.js
@@ -2,7 +2,7 @@
 
 class TextDecoder {
   static castWrapper(column, packet, index, nullBitmap, opts) {
-    column.string = () => packet.readStringLength();
+    column.string = () => packet.readStringLengthEncoded();
     column.buffer = () => packet.readBufferLengthEncoded();
     column.float = () => packet.readFloatLengthCoded();
     column.tiny = () => packet.readIntLengthEncoded();

diff --git a/lib/cmd/parser.js b/lib/cmd/parser.js
@@ -105,7 +105,7 @@ class Parser extends Command {
    * @returns {*}     null or {Resultset.readResponsePacket} in case of multi-result-set
    */
   readOKPacket(packet, out, opts, info) {
-    const okPacket = Command.parseOkPacket(packet, out, this.opts, info);
+    const okPacket = this.parseOkPacket(packet, out, this.opts, info);
     this._rows.push(okPacket);
 
     if (info.status & ServerStatus.MORE_RESULTS_EXISTS) {

diff --git a/lib/io/packet-node-encoded.js b/lib/io/packet-node-encoded.js
@@ -14,7 +14,7 @@ class PacketNodeEncoded extends Packet {
     return new PacketNodeEncoded(this.encoding).update(this.buf, this.pos, this.end);
   }
 
-  readStringLength() {
+  readStringLengthEncoded() {
     const len = this.readUnsignedLength();
     if (len === null) return null;
 

diff --git a/lib/io/packet-node-iconv.js b/lib/io/packet-node-iconv.js
@@ -13,7 +13,7 @@ class PacketIconvEncoded extends Packet {
     return new PacketIconvEncoded(this.encoding).update(this.buf, this.pos, this.end);
   }
 
-  readStringLength() {
+  readStringLengthEncoded() {
     const len = this.readUnsignedLength();
     if (len === null) return null;
 

diff --git a/lib/io/packet.js b/lib/io/packet.js
@@ -254,21 +254,8 @@ class Packet {
     return this.buf.toString('ascii', this.pos - len, this.pos);
   }
 
-  readStringLength() {
-    throw new Error(
-        'code is normally superseded by Node encoder or Iconv depending on charset used'
-    );
-  }
-
-  readStringLengthEncoded(encoding) {
-    const len = this.readUnsignedLength();
-    if (len === null) return null;
-
-    this.pos += len;
-    if (Buffer.isEncoding(encoding)) {
-      return this.buf.toString(encoding, this.pos - len, this.pos);
-    }
-    return Iconv.decode(this.buf.slice(this.pos - len, this.pos), encoding);
+  readStringLengthEncoded() {
+    throw new Error('code is normally superseded by Node encoder or Iconv depending on charset used');
   }
 
   readBigIntLengthEncoded() {

diff --git a/test/integration/test-call.js b/test/integration/test-call.js
@@ -74,6 +74,7 @@ describe('stored procedure', () => {
         done();
       });
   });
+});
 
 const testRes = async function (res) {
   assert.equal(res.length, 2);

diff --git a/test/integration/test-local-infile.js b/test/integration/test-local-infile.js
@@ -205,10 +205,9 @@ describe('local-infile', () => {
       "LOAD DATA LOCAL INFILE ? INTO TABLE smallLocalInfile FIELDS TERMINATED BY ',' (id, test)",
       smallFileName
     );
-    await conn.query(
-      "LOAD DATA LOCAL INFILE ? INTO TABLE smallLocalInfile FIELDS TERMINATED BY ',' (id, test)",
-      [smallFileName]
-    );
+    await conn.query("LOAD DATA LOCAL INFILE ? INTO TABLE smallLocalInfile FIELDS TERMINATED BY ',' (id, test)", [
+      smallFileName
+    ]);
 
     const rows2 = await conn.query('SELECT * FROM smallLocalInfile');
     assert.deepEqual(rows2, [

diff --git a/test/integration/test-pool-callback.js b/test/integration/test-pool-callback.js
@@ -244,10 +244,7 @@ describe('Pool callback', () => {
       assert.equal(err.errno, 45028);
       assert.equal(err.code, 'ER_GET_CONNECTION_TIMEOUT');
       const elapse = Date.now() - initTime;
-      assert.isOk(
-        elapse >= 499 && elapse < 550,
-        'elapse time was ' + elapse + ' but must be just after 500'
-      );
+      assert.isOk(elapse >= 499 && elapse < 550, 'elapse time was ' + elapse + ' but must be just after 500');
       errorNo += 1;
     });
     setTimeout(() => {
@@ -257,10 +254,7 @@ describe('Pool callback', () => {
         assert.equal(err.errno, 45028);
         assert.equal(err.code, 'ER_GET_CONNECTION_TIMEOUT');
         const elapse = Date.now() - initTime;
-        assert.isOk(
-          elapse >= 698 && elapse < 750,
-          'elapse time was ' + elapse + ' but must be just after 700'
-        );
+        assert.isOk(elapse >= 698 && elapse < 750, 'elapse time was ' + elapse + ' but must be just after 700');
         errorNo += 1;
       });
     }, 200);

diff --git a/test/integration/test-pool.js b/test/integration/test-pool.js
@@ -256,11 +256,7 @@ describe('Pool', () => {
       throw new Error('must have thrown error');
     } catch (err) {
       assert.isTrue(
-        err.errno === 1524 ||
-          err.errno === 1045 ||
-          err.errno === 1698 ||
-          err.errno === 45025 ||
-          err.errno === 45044,
+        err.errno === 1524 || err.errno === 1045 || err.errno === 1698 || err.errno === 45025 || err.errno === 45044,
         err.message
       );
     }
@@ -269,11 +265,7 @@ describe('Pool', () => {
       throw new Error('must have thrown error');
     } catch (err) {
       assert.isTrue(
-        err.errno === 1524 ||
-          err.errno === 1045 ||
-          err.errno === 1698 ||
-          err.errno === 45025 ||
-          err.errno === 45044,
+        err.errno === 1524 || err.errno === 1045 || err.errno === 1698 || err.errno === 45025 || err.errno === 45044,
         err.message
       );
     } finally {