From 79516ccce2dead11e6658596c9ad400b964d24c9 Mon Sep 17 00:00:00 2001 From: Georg Richter Date: Thu, 30 Sep 2021 08:35:29 +0200 Subject: [PATCH] Test fix: 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 rename utf8 to utf8mb3 (https://jira.mariadb.org/browse/MDEV-8334) utf8mb4 character set support was added 12 years ago and will work with all non eoled MariaDB server versions. --- test/dialect/mysql/test_reflection.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/test/dialect/mysql/test_reflection.py b/test/dialect/mysql/test_reflection.py index 3091a6a7da..6d9d3c9844 100644 --- a/test/dialect/mysql/test_reflection.py +++ b/test/dialect/mysql/test_reflection.py @@ -304,10 +304,10 @@ class ReflectionTest(fixtures.TestBase, AssertsCompiledSQL): def test_reflection_with_table_options(self, metadata, connection): comment = r"""Comment types type speedily ' " \ '' Fun!""" - if testing.against("mariadb"): + if testing.against("mariadb") or testing.db.dialect._is_mariadb: kwargs = dict( mariadb_engine="MEMORY", - mariadb_default_charset="utf8", + mariadb_default_charset="utf8mb4", mariadb_auto_increment="5", mariadb_avg_row_length="3", mariadb_password="secret", @@ -335,10 +335,10 @@ class ReflectionTest(fixtures.TestBase, AssertsCompiledSQL): def_table.create(conn) reflected = Table("mysql_def", MetaData(), autoload_with=conn) - if testing.against("mariadb"): + if testing.against("mariadb") or testing.db.dialect._is_mariadb: assert def_table.kwargs["mariadb_engine"] == "MEMORY" assert def_table.comment == comment - assert def_table.kwargs["mariadb_default_charset"] == "utf8" + assert def_table.kwargs["mariadb_default_charset"] == "utf8mb4" assert def_table.kwargs["mariadb_auto_increment"] == "5" assert def_table.kwargs["mariadb_avg_row_length"] == "3" assert def_table.kwargs["mariadb_password"] == "secret" @@ -348,7 +348,7 @@ class ReflectionTest(fixtures.TestBase, AssertsCompiledSQL): assert reflected.comment == comment assert reflected.kwargs["mariadb_comment"] == comment - assert reflected.kwargs["mariadb_default charset"] == "utf8" + assert reflected.kwargs["mariadb_default charset"] == "utf8mb4" assert reflected.kwargs["mariadb_avg_row_length"] == "3" assert reflected.kwargs["mariadb_connection"] == "fish" -- 2.47.2