BUG#35318413: Fix charset mapping for MySQL 8.1.0

Connector/Python fails to connect to a MySQL 8.1.0 server when setting
`charset="utf8mb4"` and `collation="utf8mb4_0900_ai_ci"`.

This is due to the wrong testing of the MySQL version and the
respective loading of the incorrect charset mapping module.

Change-Id: I3994c1158bc926766c9396da6515eb6063be168f

Author: nmariz

CHANGES.txt

@@ -14,6 +14,7 @@ v8.1.0
 - WL#15630: Remove Python 3.7 support
 - WL#15591: Improve the network module
 - BUG#35338384: PIP installs incompatible Connector/Python packages
+- BUG#35318413: Fix charset mapping for MySQL 8.1.0
 - BUG#35212199: Check for identifier quotes in the database name
 
 v8.0.33

lib/mysql/connector/constants.py

@@ -732,7 +732,7 @@ def set_mysql_version(cls, version: Tuple[int, ...]) -> None:
             version (tuple): MySQL version tuple.
         """
         cls.mysql_version = version[:2]
-        if cls.mysql_version == (8, 0):
+        if cls.mysql_version >= (8, 0):
             cls.desc = MYSQL_CHARACTER_SETS
 
     @classmethod
@@ -815,7 +815,7 @@ def get_charset_info(
             except IndexError as err:
                 raise ProgrammingError(f"Character set ID {charset} unknown") from err
 
-        if charset in ("utf8", "utf-8") and cls.mysql_version == (8, 0):
+        if charset in ("utf8", "utf-8") and cls.mysql_version >= (8, 0):
             charset = "utf8mb4"
         if charset is not None and collation is None:
             info = cls.get_default_collation(charset)

tests/cext/test_cext_api.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright (c) 2014, 2022, Oracle and/or its affiliates.
+# Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License, version 2.0, as
@@ -339,7 +339,7 @@ def test_get_server_version(self):
 
         self.assertTrue(3 < version[0] < 9)
         self.assertTrue(0 <= version[1] < 20)
-        self.assertTrue(0 < version[2] < 99)
+        self.assertTrue(0 <= version[2] < 99)
 
     def test_thread_id(self):
         cmy = MySQL()

tests/test_connection.py

@@ -1570,7 +1570,7 @@ def test_set_charset_collation(self):
             self.cnx.set_charset_collation(collation=collation)
             self.assertEqual(DEFAULT_CONFIGURATION["charset"], self.cnx.charset)
 
-        utf8_charset = "utf8mb3" if tests.MYSQL_VERSION[:2] == (8, 0) else "utf8"
+        utf8_charset = "utf8mb3" if tests.MYSQL_VERSION[:2] >= (8, 0) else "utf8"
         self.cnx.set_charset_collation(utf8_charset)
         self.assertEqual(33, self.cnx._charset_id)
 

tests/test_constants.py

@@ -341,7 +341,7 @@ class CharacterSetTests(tests.MySQLConnectorTests):
 
     """Tests for constants.CharacterSet"""
 
-    utf8_charset = "utf8mb3" if tests.MYSQL_VERSION[:2] == (8, 0) else "utf8"
+    utf8_charset = "utf8mb3" if tests.MYSQL_VERSION[:2] >= (8, 0) else "utf8"
 
     def test_get_info(self):
         """Get info about charset using MySQL ID"""