From 548c6042d428988d57b8450e2375959b9a01c446 Mon Sep 17 00:00:00 2001 From: Steven Vang Date: Wed, 31 Jan 2024 12:26:05 -0600 Subject: [PATCH 1/2] tornado_mysql: catch mysql 8 keyerror 255 exception --- tornado_mysql/connections.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tornado_mysql/connections.py b/tornado_mysql/connections.py index ef7e0b9..daf12b4 100644 --- a/tornado_mysql/connections.py +++ b/tornado_mysql/connections.py @@ -981,7 +981,10 @@ def _get_server_information(self): lang, stat, cap_h, salt_len = struct.unpack(' Date: Wed, 31 Jan 2024 13:48:27 -0600 Subject: [PATCH 2/2] add missing charsets --- tornado_mysql/charset.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/tornado_mysql/charset.py b/tornado_mysql/charset.py index 1cf7d91..ad0930d 100644 --- a/tornado_mysql/charset.py +++ b/tornado_mysql/charset.py @@ -249,6 +249,14 @@ def by_name(self, name): _charsets.add(Charset(241, 'utf8mb4', 'utf8mb4_esperanto_ci', '')) _charsets.add(Charset(242, 'utf8mb4', 'utf8mb4_hungarian_ci', '')) _charsets.add(Charset(243, 'utf8mb4', 'utf8mb4_sinhala_ci', '')) +_charsets.add(Charset(244, 'utf8mb4', 'utf8mb4_german2_ci', '')) +_charsets.add(Charset(245, 'utf8mb4', 'utf8mb4_croatian_ci', '')) +_charsets.add(Charset(246, 'utf8mb4', 'utf8mb4_unicode_520_ci', '')) +_charsets.add(Charset(247, 'utf8mb4', 'utf8mb4_vietnamese_ci', '')) +_charsets.add(Charset(248, 'gb18030', 'gb18030_chinese_ci', 'Yes')) +_charsets.add(Charset(249, 'gb18030', 'gb18030_bin', '')) +_charsets.add(Charset(250, 'gb18030', 'gb18030_unicode_520_ci', '')) +_charsets.add(Charset(255, 'utf8mb4', 'utf8mb4_0900_ai_ci', '')) charset_by_name = _charsets.by_name