From e5494e89dee754ca1f37ffbfa3b2f94d7a540b35 Mon Sep 17 00:00:00 2001 From: jiansong Date: Fri, 1 Jun 2018 00:43:15 -0700 Subject: [PATCH] Update character set and coallaction for mysql5.7 Our character set and collaction are also kept in the older version (possibly mysql5.5), which makes it impossible for us to create new character set and collaction through database-create. At the same time, we can't display these manually created database. Update here. More information comes from: https://dev.mysql.com/doc/refman/5.7/en/charset-charsets.html Change-Id: I14c0392e19c7846c7aed1e60fe5b5ca01f22a2f4 --- trove/common/db/mysql/data.py | 200 +++++++++++++++++++++++++++++++++- 1 file changed, 196 insertions(+), 4 deletions(-) diff --git a/trove/common/db/mysql/data.py b/trove/common/db/mysql/data.py index 10a045860e..b5a4a8b3a3 100644 --- a/trove/common/db/mysql/data.py +++ b/trove/common/db/mysql/data.py @@ -70,7 +70,14 @@ charset = {"big5": ["big5_chinese_ci", "big5_bin"], "utf8_roman_ci", "utf8_persian_ci", "utf8_esperanto_ci", - "utf8_hungarian_ci"], + "utf8_hungarian_ci", + "utf8_sinhala_ci", + "utf8_german2_ci", + "utf8_croatian_ci", + "utf8_unicode_520_ci", + "utf8_vietnamese_ci", + "utf8_general_mysql500_ci" + ], "ucs2": ["ucs2_general_ci", "ucs2_bin", "ucs2_unicode_ci", @@ -91,7 +98,14 @@ charset = {"big5": ["big5_chinese_ci", "big5_bin"], "ucs2_roman_ci", "ucs2_persian_ci", "ucs2_esperanto_ci", - "ucs2_hungarian_ci"], + "ucs2_hungarian_ci", + "ucs2_sinhala_ci", + "ucs2_german2_ci", + "ucs2_croatian_ci", + "ucs2_unicode_520_ci", + "ucs2_vietnamese_ci", + "ucs2_general_mysql500_ci" + ], "cp866": ["cp866_general_ci", "cp866_bin"], "keybcs2": ["keybcs2_general_ci", "keybcs2_bin"], "macce": ["macce_general_ci", "macce_bin"], @@ -101,19 +115,102 @@ charset = {"big5": ["big5_chinese_ci", "big5_bin"], "latin7_estonian_cs", "latin7_general_cs", "latin7_bin"], + "utf8mb4": ["utf8mb4_general_ci", + "utf8mb4_bin", + "utf8mb4_unicode_ci", + "utf8mb4_icelandic_ci", + "utf8mb4_latvian_ci", + "utf8mb4_romanian_ci", + "utf8mb4_slovenian_ci", + "utf8mb4_polish_ci", + "utf8mb4_estonian_ci", + "utf8mb4_spanish_ci", + "utf8mb4_swedish_ci", + "utf8mb4_turkish_ci", + "utf8mb4_czech_ci", + "utf8mb4_danish_ci", + "utf8mb4_lithuanian_ci", + "utf8mb4_slovak_ci", + "utf8mb4_spanish2_ci", + "utf8mb4_roman_ci", + "utf8mb4_persian_ci", + "utf8mb4_esperanto_ci", + "utf8mb4_hungarian_ci", + "utf8mb4_sinhala_ci", + "utf8mb4_german2_ci", + "utf8mb4_croatian_ci", + "utf8mb4_unicode_520_ci", + "utf8mb4_vietnamese_ci"], "cp1251": ["cp1251_general_ci", "cp1251_bulgarian_ci", "cp1251_ukrainian_ci", "cp1251_bin", "cp1251_general_cs"], + "utf16": ["utf16_general_ci", + "utf16_bin", + "utf16_unicode_ci", + "utf16_icelandic_ci", + "utf16_latvian_ci", + "utf16_romanian_ci", + "utf16_slovenian_ci", + "utf16_polish_ci", + "utf16_estonian_ci", + "utf16_spanish_ci", + "utf16_swedish_ci", + "utf16_turkish_ci", + "utf16_czech_ci", + "utf16_danish_ci", + "utf16_lithuanian_ci", + "utf16_slovak_ci", + "utf16_spanish2_ci", + "utf16_roman_ci", + "utf16_persian_ci", + "utf16_esperanto_ci", + "utf16_hungarian_ci", + "utf16_sinhala_ci", + "utf16_german2_ci", + "utf16_croatian_ci", + "utf16_unicode_520_ci", + "utf16_vietnamese_ci"], + "utf16le": ["utf16le_general_ci", + "utf16le_bin"], "cp1256": ["cp1256_general_ci", "cp1256_bin"], "cp1257": ["cp1257_general_ci", "cp1257_lithuanian_ci", "cp1257_bin"], + "utf32": ["utf32_general_ci", + "utf32_bin", + "utf32_unicode_ci", + "utf32_icelandic_ci", + "utf32_latvian_ci", + "utf32_romanian_ci", + "utf32_slovenian_ci", + "utf32_polish_ci", + "utf32_estonian_ci", + "utf32_spanish_ci", + "utf32_swedish_ci", + "utf32_turkish_ci", + "utf32_czech_ci", + "utf32_danish_ci", + "utf32_lithuanian_ci", + "utf32_slovak_ci", + "utf32_spanish2_ci", + "utf32_roman_ci", + "utf32_persian_ci", + "utf32_esperanto_ci", + "utf32_hungarian_ci", + "utf32_sinhala_ci", + "utf32_german2_ci", + "utf32_croatian_ci", + "utf32_unicode_520_ci", + "utf32_vietnamese_ci"], "binary": ["binary"], "geostd8": ["geostd8_general_ci", "geostd8_bin"], "cp932": ["cp932_japanese_ci", "cp932_bin"], - "eucjpms": ["eucjpms_japanese_ci", "eucjpms_bin"]} + "eucjpms": ["eucjpms_japanese_ci", "eucjpms_bin"], + "gb18030": ["gb18030_chinese_ci", + "gb18030_bin", + "gb18030_unicode_520_ci"]} collation = {"big5_chinese_ci": "big5", "big5_bin": "big5", @@ -190,6 +287,12 @@ collation = {"big5_chinese_ci": "big5", "utf8_persian_ci": "utf8", "utf8_esperanto_ci": "utf8", "utf8_hungarian_ci": "utf8", + "utf8_sinhala_ci": "utf8", + "utf8_german2_ci": "utf8", + "utf8_croatian_ci": "utf8", + "utf8_unicode_520_ci": "utf8", + "utf8_vietnamese_ci": "utf8", + "utf8_general_mysql500_ci": "utf8", "ucs2_general_ci": "ucs2", "ucs2_bin": "ucs2", "ucs2_unicode_ci": "ucs2", @@ -211,6 +314,12 @@ collation = {"big5_chinese_ci": "big5", "ucs2_persian_ci": "ucs2", "ucs2_esperanto_ci": "ucs2", "ucs2_hungarian_ci": "ucs2", + "ucs2_sinhala_ci": "ucs2", + "ucs2_german2_ci": "ucs2", + "ucs2_croatian_ci": "ucs2", + "ucs2_unicode_520_ci": "ucs2", + "ucs2_vietnamese_ci": "ucs2", + "ucs2_general_mysql500_ci": "ucs2", "cp866_general_ci": "cp866", "cp866_bin": "cp866", "keybcs2_general_ci": "keybcs2", @@ -225,20 +334,103 @@ collation = {"big5_chinese_ci": "big5", "latin7_general_ci": "latin7", "latin7_general_cs": "latin7", "latin7_bin": "latin7", + "utf8mb4_general_ci": "utf8mb4", + "utf8mb4_bin": "utf8mb4", + "utf8mb4_unicode_ci": "utf8mb4", + "utf8mb4_icelandic_ci": "utf8mb4", + "utf8mb4_latvian_ci": "utf8mb4", + "utf8mb4_romanian_ci": "utf8mb4", + "utf8mb4_slovenian_ci": "utf8mb4", + "utf8mb4_polish_ci": "utf8mb4", + "utf8mb4_estonian_ci": "utf8mb4", + "utf8mb4_spanish_ci": "utf8mb4", + "utf8mb4_swedish_ci": "utf8mb4", + "utf8mb4_turkish_ci": "utf8mb4", + "utf8mb4_czech_ci": "utf8mb4", + "utf8mb4_danish_ci": "utf8mb4", + "utf8mb4_lithuanian_ci": "utf8mb4", + "utf8mb4_slovak_ci": "utf8mb4", + "utf8mb4_spanish2_ci": "utf8mb4", + "utf8mb4_roman_ci": "utf8mb4", + "utf8mb4_persian_ci": "utf8mb4", + "utf8mb4_esperanto_ci": "utf8mb4", + "utf8mb4_hungarian_ci": "utf8mb4", + "utf8mb4_sinhala_ci": "utf8mb4", + "utf8mb4_german2_ci": "utf8mb4", + "utf8mb4_croatian_ci": "utf8mb4", + "utf8mb4_unicode_520_ci": "utf8mb4", + "utf8mb4_vietnamese_ci": "utf8mb4", "cp1251_bulgarian_ci": "cp1251", "cp1251_ukrainian_ci": "cp1251", "cp1251_bin": "cp1251", "cp1251_general_ci": "cp1251", "cp1251_general_cs": "cp1251", + "utf16_general_ci": "utf16", + "utf16_bin": "utf16", + "utf16_unicode_ci": "utf16", + "utf16_icelandic_ci": "utf16", + "utf16_latvian_ci": "utf16", + "utf16_romanian_ci": "utf16", + "utf16_slovenian_ci": "utf16", + "utf16_polish_ci": "utf16", + "utf16_estonian_ci": "utf16", + "utf16_spanish_ci": "utf16", + "utf16_swedish_ci": "utf16", + "utf16_turkish_ci": "utf16", + "utf16_czech_ci": "utf16", + "utf16_danish_ci": "utf16", + "utf16_lithuanian_ci": "utf16", + "utf16_slovak_ci": "utf16", + "utf16_spanish2_ci": "utf16", + "utf16_roman_ci": "utf16", + "utf16_persian_ci": "utf16", + "utf16_esperanto_ci": "utf16", + "utf16_hungarian_ci": "utf16", + "utf16_sinhala_ci": "utf16", + "utf16_german2_ci": "utf16", + "utf16_croatian_ci": "utf16", + "utf16_unicode_520_ci": "utf16", + "utf16_vietnamese_ci": "utf16", + "utf16le_general_ci": "utf16le", + "utf16le_bin": "utf16le", "cp1256_general_ci": "cp1256", "cp1256_bin": "cp1256", "cp1257_lithuanian_ci": "cp1257", "cp1257_bin": "cp1257", "cp1257_general_ci": "cp1257", + "utf32_general_ci": "utf32", + "utf32_bin": "utf32", + "utf32_unicode_ci": "utf32", + "utf32_icelandic_ci": "utf32", + "utf32_latvian_ci": "utf32", + "utf32_romanian_ci": "utf32", + "utf32_slovenian_ci": "utf32", + "utf32_polish_ci": "utf32", + "utf32_estonian_ci": "utf32", + "utf32_spanish_ci": "utf32", + "utf32_swedish_ci": "utf32", + "utf32_turkish_ci": "utf32", + "utf32_czech_ci": "utf32", + "utf32_danish_ci": "utf32", + "utf32_lithuanian_ci": "utf32", + "utf32_slovak_ci": "utf32", + "utf32_spanish2_ci": "utf32", + "utf32_roman_ci": "utf32", + "utf32_persian_ci": "utf32", + "utf32_esperanto_ci": "utf32", + "utf32_hungarian_ci": "utf32", + "utf32_sinhala_ci": "utf32", + "utf32_german2_ci": "utf32", + "utf32_croatian_ci": "utf32", + "utf32_unicode_520_ci": "utf32", + "utf32_vietnamese_ci": "utf32", "binary": "binary", "geostd8_general_ci": "geostd8", "geostd8_bin": "geostd8", "cp932_japanese_ci": "cp932", "cp932_bin": "cp932", "eucjpms_japanese_ci": "eucjpms", - "eucjpms_bin": "eucjpms"} + "eucjpms_bin": "eucjpms", + "gb18030_chinese_ci": "gb18030", + "gb18030_bin": "gb18030", + "gb18030_unicode_520_ci": "gb18030"}