Merge lp:~cjwatson/storm/mysql-8.0.24-compat into lp:storm

[Colin Watson]

Fix test compatibility with MySQL >= 8.0.24.

https://dev.mysql.com/doc/relnotes/mysql/8.0/en/news-8-0-24.html says:

   Client applications and test suite plugins now report utf8mb3 rather than utf8 when writing character set names. (Bug #32164079, Bug #32164125)

This broke the Storm test suite. Adjust it slightly to cope. Ideally we should use utf8mb4 instead, but I'm not quite sure to what extent this might break existing applications, so stick to what we know for now.

[Ioana Lasc (ilasc)]

review: Approve

=== modified file 'NEWS'
--- NEWS	2021-04-19 09:52:52 +0000
+++ NEWS	2021-05-13 23:05:18 +0000
@@ -1,3 +1,11 @@
+0.26
+====
+
+Bug fixes
+---------
+
+- Fix test compatibility with MySQL >= 8.0.24.
+
 0.25 (2021-04-19)
 =================
 
 
=== modified file 'dev/test'
--- dev/test	2021-04-06 09:23:02 +0000
+++ dev/test	2021-05-13 23:05:18 +0000
@@ -205,7 +205,8 @@
                     cursor = connection.cursor()
                     try:
                         cursor.execute(
-                            "CREATE DATABASE storm_test CHARACTER SET utf8;")
+                            "CREATE DATABASE storm_test "
+                            "CHARACTER SET utf8mb4;")
                     finally:
                         cursor.close()
                 finally:
 
=== modified file 'storm/databases/mysql.py'
--- storm/databases/mysql.py	2021-04-06 09:23:02 +0000
+++ storm/databases/mysql.py	2021-05-13 23:05:18 +0000
@@ -167,7 +167,10 @@
 
         self._connect_kwargs["conv"] = self._converters
         self._connect_kwargs["use_unicode"] = True
-        self._connect_kwargs["charset"] = uri.options.get("charset", "utf8")
+        # utf8mb3 (a.k.a. utf8) is deprecated, but it's not clear that we
+        # can change it without breaking applications.  Default to utf8mb3
+        # for now.
+        self._connect_kwargs["charset"] = uri.options.get("charset", "utf8mb3")
 
     def _raw_connect(self):
         raw_connection = ConnectionWrapper(
 
=== modified file 'storm/tests/databases/mysql.py'
--- storm/tests/databases/mysql.py	2021-04-06 09:23:02 +0000
+++ storm/tests/databases/mysql.py	2021-05-13 23:05:18 +0000
@@ -78,9 +78,9 @@
                            ("unix_socket", "us")]:
             self.assertEqual(database._connect_kwargs.get(key), value)
 
-    def test_charset_defaults_to_utf8(self):
+    def test_charset_defaults_to_utf8mb3(self):
         result = self.connection.execute("SELECT @@character_set_client")
-        self.assertEqual(result.get_one(), ("utf8",))
+        self.assertEqual(result.get_one(), ("utf8mb3",))
 
     def test_charset_option(self):
         uri = URI(os.environ["STORM_MYSQL_URI"])
 
=== modified file 'storm/tests/store/base.py'
--- storm/tests/store/base.py	2021-04-06 09:23:02 +0000
+++ storm/tests/store/base.py	2021-05-13 23:05:18 +0000
@@ -6039,7 +6039,7 @@
             except AssertionError as e:
                 raise AssertionError(six.text_type(e, 'replace') +
                     " (ensure your database was created with CREATE DATABASE"
-                    " ... CHARACTER SET utf8)")
+                    " ... CHARACTER SET utf8mb3)")
 
     def test_creation_order_is_preserved_when_possible(self):
         foos = [self.store.add(Foo()) for i in range(10)]