MySQL 5.6/8.0 charset

.travis.yml

@@ -14,13 +14,19 @@ matrix:
   - node_js: "7.4"
     env: LINT=1
 
+cache:
+  yarn: true
+  directories:
+  - node_modules
+  - $HOME/.yarn-cache
+
 notifications:
   email: false
 
 script:
   - docker run -d --name mysql -e MYSQL_ALLOW_EMPTY_PASSWORD=1 -e MYSQL_DATABASE=test -p 33306:3306 mysql:5.7
   - docker run --link mysql:db -e CHECK_PORT=3306 -e CHECK_HOST=db giorgos/takis
   - node --version
-  - npm --version
-  - if [ "$LINT" = "1" ]; then npm run lint; fi
-  - MYSQL_PORT=33306 npm run test:raw
+  - yarn --version
+  - if [ "$LINT" = "1" ]; then yarn run lint; fi
+  - MYSQL_PORT=33306 yarn run test:raw

appveyor.yml

@@ -16,10 +16,11 @@ services:
 
 cache:
   - node_modules
+  - "%LOCALAPPDATA%/Yarn"
 
 install:
   - ps: Install-Product node $env:nodejs_version
-  - npm install
+  - yarn install
 
 build: off
 
@@ -30,8 +31,8 @@ before_test:
 test_script:
   - mysql --version
   - node --version
-  - npm --version
-  - if "%LINT%"=="1" (npm run lint)
+  - yarn --version
+  - if "%LINT%"=="1" (yarn run lint)
   - node test/run.js
   - SET MYSQL_USE_COMPRESSION=1
   - node test/run.js

lib/constants/charsets.js

@@ -52,11 +52,13 @@ exports.CP1251_GENERAL_CS = 52;
 exports.MACROMAN_BIN = 53;
 exports.UTF16_GENERAL_CI = 54;
 exports.UTF16_BIN = 55;
+exports.UTF16LE_GENERAL_CI = 56;
 exports.CP1256_GENERAL_CI = 57;
 exports.CP1257_BIN = 58;
 exports.CP1257_GENERAL_CI = 59;
 exports.UTF32_GENERAL_CI = 60;
 exports.UTF32_BIN = 61;
+exports.UTF16LE_BIN = 62;
 exports.BINARY = 63;
 exports.ARMSCII8_BIN = 64;
 exports.ASCII_BIN = 65;
@@ -70,6 +72,7 @@ exports.HP8_BIN = 72;
 exports.KEYBCS2_BIN = 73;
 exports.KOI8R_BIN = 74;
 exports.KOI8U_BIN = 75;
+exports.UTF8_TOLOWER_CI = 76;
 exports.LATIN2_BIN = 77;
 exports.LATIN5_BIN = 78;
 exports.LATIN7_BIN = 79;
@@ -113,6 +116,10 @@ exports.UTF16_PERSIAN_CI = 117;
 exports.UTF16_ESPERANTO_CI = 118;
 exports.UTF16_HUNGARIAN_CI = 119;
 exports.UTF16_SINHALA_CI = 120;
+exports.UTF16_GERMAN2_CI = 121;
+exports.UTF16_CROATIAN_CI = 122;
+exports.UTF16_UNICODE_520_CI = 123;
+exports.UTF16_VIETNAMESE_CI = 124;
 exports.UCS2_UNICODE_CI = 128;
 exports.UCS2_ICELANDIC_CI = 129;
 exports.UCS2_LATVIAN_CI = 130;
@@ -133,6 +140,11 @@ exports.UCS2_PERSIAN_CI = 144;
 exports.UCS2_ESPERANTO_CI = 145;
 exports.UCS2_HUNGARIAN_CI = 146;
 exports.UCS2_SINHALA_CI = 147;
+exports.UCS2_GERMAN2_CI = 148;
+exports.UCS2_CROATIAN_CI = 149;
+exports.UCS2_UNICODE_520_CI = 150;
+exports.UCS2_VIETNAMESE_CI = 151;
+exports.UCS2_GENERAL_MYSQL500_CI = 159;
 exports.UTF32_UNICODE_CI = 160;
 exports.UTF32_ICELANDIC_CI = 161;
 exports.UTF32_LATVIAN_CI = 162;
@@ -153,6 +165,10 @@ exports.UTF32_PERSIAN_CI = 176;
 exports.UTF32_ESPERANTO_CI = 177;
 exports.UTF32_HUNGARIAN_CI = 178;
 exports.UTF32_SINHALA_CI = 179;
+exports.UTF32_GERMAN2_CI = 180;
+exports.UTF32_CROATIAN_CI = 181;
+exports.UTF32_UNICODE_520_CI = 182;
+exports.UTF32_VIETNAMESE_CI = 183;
 exports.UTF8_UNICODE_CI = 192;
 exports.UTF8_ICELANDIC_CI = 193;
 exports.UTF8_LATVIAN_CI = 194;
@@ -173,6 +189,11 @@ exports.UTF8_PERSIAN_CI = 208;
 exports.UTF8_ESPERANTO_CI = 209;
 exports.UTF8_HUNGARIAN_CI = 210;
 exports.UTF8_SINHALA_CI = 211;
+exports.UTF8_GERMAN2_CI = 212;
+exports.UTF8_CROATIAN_CI = 213;
+exports.UTF8_UNICODE_520_CI = 214;
+exports.UTF8_VIETNAMESE_CI = 215;
+exports.UTF8_GENERAL_MYSQL500_CI = 223;
 exports.UTF8MB4_UNICODE_CI = 224;
 exports.UTF8MB4_ICELANDIC_CI = 225;
 exports.UTF8MB4_LATVIAN_CI = 226;
@@ -193,3 +214,75 @@ exports.UTF8MB4_PERSIAN_CI = 240;
 exports.UTF8MB4_ESPERANTO_CI = 241;
 exports.UTF8MB4_HUNGARIAN_CI = 242;
 exports.UTF8MB4_SINHALA_CI = 243;
+exports.UTF8MB4_GERMAN2_CI = 244;
+exports.UTF8MB4_CROATIAN_CI = 245;
+exports.UTF8MB4_UNICODE_520_CI = 246;
+exports.UTF8MB4_VIETNAMESE_CI = 247;
+exports.GB18030_CHINESE_CI = 248;
+exports.GB18030_BIN = 249;
+exports.GB18030_UNICODE_520_CI = 250;
+exports.UTF8_GENERAL50_CI = 253;
+exports.UTF8MB4_0900_AI_CI = 255;
+exports.UTF8MB4_CS_0900_AI_CI = 266;
+exports.UTF8MB4_DA_0900_AI_CI = 267;
+exports.UTF8MB4_DE_PB_0900_AI_CI = 256;
+exports.UTF8MB4_EO_0900_AI_CI = 273;
+exports.UTF8MB4_ES_0900_AI_CI = 263;
+exports.UTF8MB4_ES_TRAD_0900_AI_CI = 270;
+exports.UTF8MB4_ET_0900_AI_CI = 262;
+exports.UTF8MB4_HR_0900_AI_CI = 275;
+exports.UTF8MB4_HU_0900_AI_CI = 274;
+exports.UTF8MB4_IS_0900_AI_CI = 257;
+exports.UTF8MB4_LA_0900_AI_CI = 271;
+exports.UTF8MB4_LT_0900_AI_CI = 268;
+exports.UTF8MB4_LV_0900_AI_CI = 258;
+exports.UTF8MB4_PL_0900_AI_CI = 261;
+exports.UTF8MB4_RO_0900_AI_CI = 259;
+exports.UTF8MB4_SK_0900_AI_CI = 269;
+exports.UTF8MB4_SL_0900_AI_CI = 260;
+exports.UTF8MB4_SV_0900_AI_CI = 264;
+exports.UTF8MB4_TR_0900_AI_CI = 265;
+exports.UTF8MB4_VI_0900_AI_CI = 277;
+
+// short aliases
+exports.BIG5 = exports.BIG5_CHINESE_CI;
+exports.DEC8 = exports.DEC8_SWEDISH_CI;
+exports.CP850 = exports.CP850_GENERAL_CI;
+exports.HP8 = exports.HP8_ENGLISH_CI;
+exports.KOI8R = exports.KOI8R_GENERAL_CI;
+exports.LATIN1 = exports.LATIN1_SWEDISH_CI;
+exports.LATIN2 = exports.LATIN2_GENERAL_CI;
+exports.SWE7 = exports.SWE7_SWEDISH_CI;
+exports.ASCII = exports.ASCII_GENERAL_CI;
+exports.UJIS = exports.UJIS_JAPANESE_CI;
+exports.SJIS = exports.SJIS_JAPANESE_CI;
+exports.HEBREW = exports.HEBREW_GENERAL_CI;
+exports.TIS620 = exports.TIS620_THAI_CI;
+exports.EUCKR = exports.EUCKR_KOREAN_CI;
+exports.KOI8U = exports.KOI8U_GENERAL_CI;
+exports.GB2312 = exports.GB2312_CHINESE_CI;
+exports.GREEK = exports.GREEK_GENERAL_CI;
+exports.CP1250 = exports.CP1250_GENERAL_CI;
+exports.GBK = exports.GBK_CHINESE_CI;
+exports.LATIN5 = exports.LATIN5_TURKISH_CI;
+exports.ARMSCII8 = exports.ARMSCII8_GENERAL_CI;
+exports.UTF8 = exports.UTF8_GENERAL_CI;
+exports.UCS2 = exports.UCS2_GENERAL_CI;
+exports.CP866 = exports.CP866_GENERAL_CI;
+exports.KEYBCS2 = exports.KEYBCS2_GENERAL_CI;
+exports.MACCE = exports.MACCE_GENERAL_CI;
+exports.MACROMAN = exports.MACROMAN_GENERAL_CI;
+exports.CP852 = exports.CP852_GENERAL_CI;
+exports.LATIN7 = exports.LATIN7_GENERAL_CI;
+exports.UTF8MB4 = exports.UTF8MB4_GENERAL_CI;
+exports.CP1251 = exports.CP1251_GENERAL_CI;
+exports.UTF16 = exports.UTF16_GENERAL_CI;
+exports.UTF16LE = exports.UTF16LE_GENERAL_CI;
+exports.CP1256 = exports.CP1256_GENERAL_CI;
+exports.CP1257 = exports.CP1257_GENERAL_CI;
+exports.UTF32 = exports.UTF32_GENERAL_CI;
+exports.BINARY = exports.BINARY;
+exports.CP932 = exports.CP932_JAPANESE_CI;
+exports.EUCJPMS = exports.EUCJPMS_JAPANESE_CI;
+exports.GB18030 = exports.GB18030_CHINESE_CI;
+exports.GEOSTD8 = exports.GEOSTD8_GENERAL_CI;

tools/generate-charset-mapping.js

@@ -19,6 +19,7 @@ var charsets = []
 var mysql2iconv = {
   utf8: 'cesu8',
   utf8mb4: 'utf8',
+  utf16le: 'utf16-le',
   // need to check that this is correct mapping
   macce: 'macintosh', // Mac Central European
   eucjpms: 'eucjp'    // UJIS for Windows Japanese