summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/dialects/mysql/base.py
diff options
context:
space:
mode:
authorGeorg Richter <georg@mariadb.com>2021-09-30 18:13:49 -0400
committerMike Bayer <mike_mp@zzzcomputing.com>2021-10-01 13:08:00 -0400
commit2e6285d8d1d293c841f18313c94e493b2804055c (patch)
treef93f19a00e16e2a0d62cf43d06909433637509d7 /lib/sqlalchemy/dialects/mysql/base.py
parentab6605aee23ed2c70c38bd5b9f50a6395ac3f2e1 (diff)
downloadsqlalchemy-2e6285d8d1d293c841f18313c94e493b2804055c.tar.gz
correct charset for mariadb connector with mdb 10.6
Updated test suite to pass correctly for MariaDB 10.6 when using the mariadb-connector driver, which made some adjustments to default encoding. Pull request courtesy Georg Richter. Use character set utf8mb4 instead of utf8: 1) Character set for mariadb connector is utf8mb4 and cannot be changed. 2) Since MariaDB 10.6.1 utf8 is mapped to utf8mb3, and will be mapped to utf8mb4 in 10.7, see [MDEV-8334](https://jira.mariadb.org/browse/MDEV-8334) (rename utf8 to utf8mb3) utf8mb4 character set support was added 12 years ago and will work with all non eoled MariaDB server versions. Fixes: #7115 Closes: #7116 Pull-request: https://github.com/sqlalchemy/sqlalchemy/pull/7116 Pull-request-sha: 79516ccce2dead11e6658596c9ad400b964d24c9 Change-Id: I86c30fb636c46307cb551080641e324d2bbc1cb3
Diffstat (limited to 'lib/sqlalchemy/dialects/mysql/base.py')
-rw-r--r--lib/sqlalchemy/dialects/mysql/base.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/sqlalchemy/dialects/mysql/base.py b/lib/sqlalchemy/dialects/mysql/base.py
index 0c24ebf5e..530e7c9cc 100644
--- a/lib/sqlalchemy/dialects/mysql/base.py
+++ b/lib/sqlalchemy/dialects/mysql/base.py
@@ -3537,6 +3537,8 @@ class _DecodingRow(object):
"koi8u": "koi8_u",
"utf16": "utf-16-be", # MySQL's uft16 is always bigendian
"utf8mb4": "utf8", # real utf8
+ "utf8mb3": "utf8", # real utf8; saw this happen on CI but I cannot
+ # reproduce, possibly mariadb10.6 related
"eucjpms": "ujis",
}