From c6b5bb4c117bf4d1f18bf2e14003541d72e7766b Mon Sep 17 00:00:00 2001
From: Alvie Zhang <alvie.zhang@gmail.com>
Date: Tue, 19 Apr 2022 13:25:16 +0800
Subject: [PATCH] Fix SSL connection handshake charset not respecting
 connection configuration

---
 aiomysql/connection.py | 14 +++++---------
 tests/test_basic.py    | 14 ++++++++++++++
 2 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/aiomysql/connection.py b/aiomysql/connection.py
index 42573f2f..022315a9 100644
--- a/aiomysql/connection.py
+++ b/aiomysql/connection.py
@@ -733,12 +733,12 @@ async def _request_authentication(self):
         if self.user is None:
             raise ValueError("Did not specify a username")
 
-        if self._ssl_context and self.server_capabilities & CLIENT.SSL:
-            # capablities, max packet, charset
-            data = struct.pack('<IIB', self.client_flag, 16777216, 33)
-            data += b'\x00' * (32 - len(data))
+        charset_id = charset_by_name(self.charset).id
+        data_init = struct.pack('<iIB23s', self.client_flag, MAX_PACKET_LEN,
+                                charset_id, b'')
 
-            self.write_packet(data)
+        if self._ssl_context and self.server_capabilities & CLIENT.SSL:
+            self.write_packet(data_init)
 
             # Stop sending events to data_received
             self._writer.transport.pause_reading()
@@ -762,15 +762,11 @@ async def _request_authentication(self):
 
             self._secure = True
 
-        charset_id = charset_by_name(self.charset).id
         if isinstance(self.user, str):
             _user = self.user.encode(self.encoding)
         else:
             _user = self.user
 
-        data_init = struct.pack('<iIB23s', self.client_flag, MAX_PACKET_LEN,
-                                charset_id, b'')
-
         data = data_init + _user + b'\0'
 
         authresp = b''
diff --git a/tests/test_basic.py b/tests/test_basic.py
index 19a5abf2..b0a939bf 100644
--- a/tests/test_basic.py
+++ b/tests/test_basic.py
@@ -106,6 +106,20 @@ async def test_string(cursor, table_cleanup):
     assert (test_value,) == r
 
 
+@pytest.mark.run_loop
+async def test_string_with_emoji(cursor, table_cleanup):
+    await cursor.execute("DROP TABLE IF EXISTS test_string_with_emoji;")
+    await cursor.execute("CREATE TABLE test_string_with_emoji (a text) "
+                         "DEFAULT CHARACTER SET=\"utf8mb4\"")
+    test_value = "I am a test string with emoji 😄"
+    table_cleanup('test_string_with_emoji')
+    await cursor.execute("INSERT INTO test_string_with_emoji (a) VALUES (%s)",
+                         test_value)
+    await cursor.execute("SELECT a FROM test_string_with_emoji")
+    r = await cursor.fetchone()
+    assert (test_value,) == r
+
+
 @pytest.mark.run_loop
 async def test_integer(cursor, table_cleanup):
     await cursor.execute("CREATE TABLE test_integer (a INTEGER)")