stack/erp5: use utf8mb4_unicode_ci mariadb collation

software/erp5/test/test/test_mariadb.py

@@ -103,7 +103,7 @@ class TestMariaDB(MariaDBTestCase):
       cnx.store_result()
       cnx.query(
           """
-          insert into test_utf8_collation values ("à"), ("あ")
+          insert into test_utf8_collation values ("à"), ("あ"), ("😀")
           """)
       cnx.store_result()
 
@@ -113,6 +113,18 @@ class TestMariaDB(MariaDBTestCase):
           """)
       self.assertEqual((('à',),), cnx.store_result().fetch_row(maxrows=2))
 
+      cnx.query(
+          """
+          select * from test_utf8_collation where col1 = "ア"
+          """)
+      self.assertEqual((('あ',),), cnx.store_result().fetch_row(maxrows=2))
+
+      cnx.query(
+          """
+          select * from test_utf8_collation where col1 = "😀"
+          """)
+      self.assertEqual((('😀',),), cnx.store_result().fetch_row(maxrows=2))
+
 
 class TestMroonga(MariaDBTestCase):
   def test_mroonga_plugin_loaded(self):

stack/erp5/buildout.hash.cfg

@@ -42,7 +42,7 @@ md5sum = d32417746fcf671d4e86a70379815039
 
 [template-my-cnf]
 filename = my.cnf.in
-md5sum = 7944ec58a2c6ee74a56219bacebfd145
+md5sum = afefa29c683b7a72aef90bb8b409302d
 
 [template-mariadb-initial-setup]
 filename = mariadb_initial_setup.sql.in

stack/erp5/my.cnf.in

@@ -68,7 +68,7 @@ server_id = {{ parameter_dict['server-id'] }}
 
 # Force utf8 usage
 character_set_server = utf8mb4
-collation_server = utf8mb4_general_ci
+collation_server = utf8mb4_unicode_ci
 skip_character_set_client_handshake
 
 {% if 'ssl-key' in parameter_dict -%}