Skip to content

Commit 810e6a4

Browse files
authored
Merge pull request #1410 from testn/add-missing-collation
Update collation list up to MySQL 8.0.26
2 parents 6d34609 + 782ee67 commit 810e6a4

File tree

2 files changed

+45
-14
lines changed

2 files changed

+45
-14
lines changed

lib/constants/charset_encodings.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ module.exports = [
104104
'eucjpms',
105105
'eucjpms',
106106
'cp1250',
107-
'utf8',
107+
'utf16',
108108
'utf16',
109109
'utf16',
110110
'utf16',
@@ -309,5 +309,8 @@ module.exports = [
309309
'utf8',
310310
'utf8',
311311
'utf8',
312+
'utf8',
313+
'utf8',
314+
'utf8',
312315
'utf8'
313316
];

lib/constants/charsets.js

Lines changed: 41 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -223,28 +223,56 @@ exports.UTF8MB4_VIETNAMESE_CI = 247;
223223
exports.GB18030_CHINESE_CI = 248;
224224
exports.GB18030_BIN = 249;
225225
exports.GB18030_UNICODE_520_CI = 250;
226-
exports.UTF8_GENERAL50_CI = 253;
226+
exports.UTF8_GENERAL50_CI = 253; // deprecated
227227
exports.UTF8MB4_0900_AI_CI = 255;
228-
exports.UTF8MB4_CS_0900_AI_CI = 266;
229-
exports.UTF8MB4_DA_0900_AI_CI = 267;
230228
exports.UTF8MB4_DE_PB_0900_AI_CI = 256;
231-
exports.UTF8MB4_EO_0900_AI_CI = 273;
232-
exports.UTF8MB4_ES_0900_AI_CI = 263;
233-
exports.UTF8MB4_ES_TRAD_0900_AI_CI = 270;
234-
exports.UTF8MB4_ET_0900_AI_CI = 262;
235-
exports.UTF8MB4_HR_0900_AI_CI = 275;
236-
exports.UTF8MB4_HU_0900_AI_CI = 274;
237229
exports.UTF8MB4_IS_0900_AI_CI = 257;
238-
exports.UTF8MB4_LA_0900_AI_CI = 271;
239-
exports.UTF8MB4_LT_0900_AI_CI = 268;
240230
exports.UTF8MB4_LV_0900_AI_CI = 258;
241-
exports.UTF8MB4_PL_0900_AI_CI = 261;
242231
exports.UTF8MB4_RO_0900_AI_CI = 259;
243-
exports.UTF8MB4_SK_0900_AI_CI = 269;
244232
exports.UTF8MB4_SL_0900_AI_CI = 260;
233+
exports.UTF8MB4_PL_0900_AI_CI = 261;
234+
exports.UTF8MB4_ET_0900_AI_CI = 262;
235+
exports.UTF8MB4_ES_0900_AI_CI = 263;
245236
exports.UTF8MB4_SV_0900_AI_CI = 264;
246237
exports.UTF8MB4_TR_0900_AI_CI = 265;
238+
exports.UTF8MB4_CS_0900_AI_CI = 266;
239+
exports.UTF8MB4_DA_0900_AI_CI = 267;
240+
exports.UTF8MB4_LT_0900_AI_CI = 268;
241+
exports.UTF8MB4_SK_0900_AI_CI = 269;
242+
exports.UTF8MB4_ES_TRAD_0900_AI_CI = 270;
243+
exports.UTF8MB4_LA_0900_AI_CI = 271;
244+
exports.UTF8MB4_EO_0900_AI_CI = 273;
245+
exports.UTF8MB4_HU_0900_AI_CI = 274;
246+
exports.UTF8MB4_HR_0900_AI_CI = 275;
247247
exports.UTF8MB4_VI_0900_AI_CI = 277;
248+
exports.UTF8MB4_0900_AS_CS = 278;
249+
exports.UTF8MB4_DE_PB_0900_AS_CS = 279;
250+
exports.UTF8MB4_IS_0900_AS_CS = 280;
251+
exports.UTF8MB4_LV_0900_AS_CS = 281;
252+
exports.UTF8MB4_RO_0900_AS_CS = 282;
253+
exports.UTF8MB4_SL_0900_AS_CS = 283;
254+
exports.UTF8MB4_PL_0900_AS_CS = 284;
255+
exports.UTF8MB4_ET_0900_AS_CS = 285;
256+
exports.UTF8MB4_ES_0900_AS_CS = 286;
257+
exports.UTF8MB4_SV_0900_AS_CS = 287;
258+
exports.UTF8MB4_TR_0900_AS_CS = 288;
259+
exports.UTF8MB4_CS_0900_AS_CS = 289;
260+
exports.UTF8MB4_DA_0900_AS_CS = 290;
261+
exports.UTF8MB4_LT_0900_AS_CS = 291;
262+
exports.UTF8MB4_SK_0900_AS_CS = 292;
263+
exports.UTF8MB4_ES_TRAD_0900_AS_CS = 293;
264+
exports.UTF8MB4_LA_0900_AS_CS = 294;
265+
exports.UTF8MB4_EO_0900_AS_CS = 296;
266+
exports.UTF8MB4_HU_0900_AS_CS = 297;
267+
exports.UTF8MB4_HR_0900_AS_CS = 298;
268+
exports.UTF8MB4_VI_0900_AS_CS = 300;
269+
exports.UTF8MB4_JA_0900_AS_CS = 303;
270+
exports.UTF8MB4_JA_0900_AS_CS_KS = 304;
271+
exports.UTF8MB4_0900_AS_CI = 305;
272+
exports.UTF8MB4_RU_0900_AI_CI = 306;
273+
exports.UTF8MB4_RU_0900_AS_CS = 307;
274+
exports.UTF8MB4_ZH_0900_AS_CS = 308;
275+
exports.UTF8MB4_0900_BIN = 309;
248276

249277
// short aliases
250278
exports.BIG5 = exports.BIG5_CHINESE_CI;

0 commit comments

Comments
 (0)