use utf8 for UTF8MB4 charsets

Author: Andrey Sidorov

lib/constants/charset_encodings.js

@@ -7,7 +7,7 @@ module.exports = [
   'hebrew', null, 'tis620', 'euckr', 'latin7', 'latin2', 'koi8u', 'cp1251',
   'gb2312', 'greek', 'cp1250', 'latin2', 'gbk', 'cp1257', 'latin5', 'latin1',
   'armscii8', 'cesu8', 'cp1250', 'ucs2', 'cp866', 'keybcs2', 'macintosh', 'macroman',
-  'cp852', 'latin7', 'latin7', 'macintosh', 'cp1250', 'cesu8', 'cesu8', 'latin1',
+  'cp852', 'latin7', 'latin7', 'macintosh', 'cp1250', 'utf8', 'utf8', 'latin1',
   'latin1', 'latin1', 'cp1251', 'cp1251', 'cp1251', 'macroman', 'utf16', 'utf16',
   'utf16le', 'cp1256', 'cp1257', 'cp1257', 'utf32', 'utf32', 'utf16le', 'binary',
   'armscii8', 'ascii', 'cp1250', 'cp1256', 'cp866', 'dec8', 'greek', 'hebrew',
@@ -30,8 +30,8 @@ module.exports = [
   'cesu8', 'cesu8', 'cesu8', 'cesu8', 'cesu8', 'cesu8', 'cesu8', 'cesu8',
   'cesu8', 'cesu8', 'cesu8', 'cesu8', 'cesu8', 'cesu8', 'cesu8', 'cesu8',
   null, null, null, null, null, null, null, 'cesu8',
-  'cesu8', 'cesu8', 'cesu8', 'cesu8', 'cesu8', 'cesu8', 'cesu8', 'cesu8',
-  'cesu8', 'cesu8', 'cesu8', 'cesu8', 'cesu8', 'cesu8', 'cesu8', 'cesu8',
-  'cesu8', 'cesu8', 'cesu8', 'cesu8', 'cesu8', 'cesu8', 'cesu8', 'cesu8',
+  'utf8', 'utf8', 'utf8', 'utf8', 'utf8', 'utf8', 'utf8', 'utf8',
+  'utf8', 'utf8', 'utf8', 'utf8', 'utf8', 'utf8', 'utf8', 'utf8',
+  'utf8', 'utf8', 'utf8', 'utf8', 'utf8', 'utf8', 'utf8', 'utf8',
   'gb18030', 'gb18030', 'gb18030'
 ];

tools/generate-charset-mapping.js

@@ -16,7 +16,7 @@ var charsets = []
 
 var mysql2iconv = {
   utf8: 'cesu8',
-  utf8mb4: 'cesu8',
+  utf8mb4: 'utf8',
   // need to check that this is correct mapping
   macce: 'macintosh', // Mac Central European
   eucjpms: 'eucjp'    // UJIS for Windows Japanese
@@ -34,7 +34,10 @@ conn.query('show collation', function(err, res) {
     charsets[r.Id] = iconvCharset;
   });
   //console.log(JSON.stringify(missing, 4, null));
-  console.log(JSON.stringify(charsets, 4, null));
+  //console.log(JSON.stringify(charsets, 4, null));
+  for (var i=0; i < charsets.length; i+=8) {
+    console.log("  '" + charsets.slice(i, i+8).join("', '") + "',");
+  }
 });
 
 conn.end();