Django/django
11
0
Fork 0
Code Pull Requests Projects Releases Activity

[3.2.x] Fixed collation tests on MySQL 8.0.30+.

Browse Source 
The utf8_ collations are renamed to utf8mb3_* on MySQL 8.0.30+.

Backport of 88dba2e3fd64b64bcf4fae83b256b4f6f492558f from main.
This commit is contained in:
Mariusz Felisiak 2022-07-27 21:36:25 +02:00
parent 840d009c06
commit cb7fbac9f8
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
django/db/backends/mysql/features.py
View File

@ -51,9 +51,15 @@ class DatabaseFeatures(BaseDatabaseFeatures):
@cached_property @cached_property
def test_collations(self): def test_collations(self):
charset = 'utf8' charset = 'utf8'
if self.connection.mysql_is_mariadb and self.connection.mysql_version >= (10, 6): if (
# utf8 is an alias for utf8mb3 in MariaDB 10.6+. self.connection.mysql_is_mariadb
charset = 'utf8mb3' and self.connection.mysql_version >= (10, 6)
) or (
not self.connection.mysql_is_mariadb
and self.connection.mysql_version >= (8, 0, 30)
):
# utf8 is an alias for utf8mb3 in MariaDB 10.6+ and MySQL 8.0.30+.
charset = "utf8mb3"
return { return {
'ci': f'{charset}_general_ci', 'ci': f'{charset}_general_ci',
'non_default': f'{charset}_esperanto_ci', 'non_default': f'{charset}_esperanto_ci',