[CONJS-194] Charset change using parameterized query fails with "Unca…

…ught TypeError: opts.emit is not a function"
mariadb-corporation · Apr 26, 2022 · 787a0f9 · 787a0f9
1 parent 7281586
commit 787a0f9
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 4 deletions.
diff --git a/lib/cmd/command.js b/lib/cmd/command.js
@@ -106,7 +106,7 @@ class Command extends EventEmitter {
     this.emit('end');
   }
 
-  parseOkPacket(packet, out, opts, info) {
+  parseOkPacket(packet, out, opts, connectionOpts, info) {
     packet.skip(1); //skip header
 
     const affectedRows = packet.readUnsignedLength();
@@ -139,7 +139,7 @@ class Command extends EventEmitter {
                     this.throwError(new Error("unknown charset : '" + value + "'"), info);
                     return;
                   }
-                  opts.emit('collation', info.collation);
+                  connectionOpts.emit('collation', info.collation);
                   break;
 
                 default:

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 = this.parseOkPacket(packet, out, this.opts, info);
+    const okPacket = this.parseOkPacket(packet, out, this.opts, opts, info);
     this._rows.push(okPacket);
 
     if (info.status & ServerStatus.MORE_RESULTS_EXISTS) {

diff --git a/lib/const/collations.js b/lib/const/collations.js
@@ -14,7 +14,7 @@ class Collation {
   }
 
   static fromCharset(charset) {
-    return defaultCharsets[charset];
+    return defaultCharsets[charset == 'utf8mb3' ? 'utf8' : charset];
   }
 
   static fromIndex(index) {

diff --git a/test/integration/test-pool.js b/test/integration/test-pool.js
@@ -898,6 +898,21 @@ describe('Pool', () => {
     });
   });
 
+  it('pool charset change', async function () {
+    const pool = base.createPool({ connectionLimit: 1 });
+    try {
+      const query = "SET NAMES 'utf8'";
+
+      const result1 = await pool.query(query);
+      assert.equal(result1.constructor.name, 'OkPacket');
+
+      const result2 = await pool.query({ sql: query });
+      assert.equal(result2.constructor.name, 'OkPacket');
+    } finally {
+      await pool.end();
+    }
+  });
+
   it('pool batch', function (done) {
     let params = { connectionLimit: 1, resetAfterUse: false };
     if (isXpand()) params['initSql'] = 'SET NAMES UTF8';