Skip to content

Commit 4a6e081

Browse files
committed
convert mysql encoding name to iconv name
1 parent 5ffeb7d commit 4a6e081

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

test/integration/connection/encoding/test-charset-results.js

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,11 @@ function tryEncoding (encoding, cb) {
99
connection.query('set character_set_results = ?', [encoding], function (err) {
1010
connection.query('SELECT ?', [payload], function (err, rows, fields) {
1111
assert.ifError(err);
12-
assert.equal(mysql.CharsetToEncoding[fields[0].characterSet], encoding);
12+
var iconvEncoding = encoding;
13+
if (encoding == 'utf8mb4') {
14+
iconvEncoding = 'utf8';
15+
}
16+
assert.equal(mysql.CharsetToEncoding[fields[0].characterSet], iconvEncoding);
1317
assert.equal(fields[0].name, payload);
1418
assert.equal(rows[0][fields[0].name], payload);
1519
cb();
@@ -20,7 +24,7 @@ function tryEncoding (encoding, cb) {
2024
tryEncoding('cp1251', function () {
2125
tryEncoding('koi8r', function () {
2226
tryEncoding('cp866', function () {
23-
tryEncoding('utf8', function () {
27+
tryEncoding('utf8mb4', function () {
2428
connection.end();
2529
});
2630
});

0 commit comments

Comments
 (0)