singlestoredb 1.12.3__cp38-abi3-macosx_10_9_universal2.whl → 1.12.4__cp38-abi3-macosx_10_9_universal2.whl

singlestoredb/__init__.py

@@ -13,7 +13,7 @@ Examples
 
 """
 
-__version__ = '1.12.3'
+__version__ = '1.12.4'
 
 from typing import Any
 

singlestoredb/mysql/connection.py

@@ -989,18 +989,11 @@ class Connection(BaseConnection):
 
     def set_character_set(self, charset, collation=None):
         """
-        Set session charaset (and collation) on the server.
+        Set charaset (and collation) on the server.
 
-        Send "SET [COLLATION|CHARACTER_SET]_SERVER = [collation|charset]" query.
+        Send "SET NAMES charset [COLLATE collation]" query.
         Update Connection.encoding based on charset.
 
-        If charset/collation are being set to utf8mb4, the corresponding global
-        variables (COLLATION_SERVER and CHARACTER_SET_SERVER) must be also set
-        to utf8mb4. This is true by default for SingleStore 8.7+. For previuous
-        versions or non-default setting user must manully run the query
-        `SET global collation_connection = utf8mb4_general_ci`
-        replacing utf8mb4_general_ci with {collation}.
-
         Parameters
         ----------
         charset : str
@@ -1013,9 +1006,9 @@ class Connection(BaseConnection):
         encoding = charset_by_name(charset).encoding
 
         if collation:
-            query = f'SET COLLATION_SERVER={collation}'
+            query = f'SET NAMES {charset} COLLATE {collation}'
         else:
-            query = f'SET CHARACTER_SET_SERVER={charset}'
+            query = f'SET NAMES {charset}'
         self._execute_command(COMMAND.COM_QUERY, query)
         self._read_packet()
         self.charset = charset
@@ -1119,6 +1112,19 @@ class Connection(BaseConnection):
             self._get_server_information()
             self._request_authentication()
 
+            # Send "SET NAMES" query on init for:
+            # - Ensure charaset (and collation) is set to the server.
+            #   - collation_id in handshake packet may be ignored.
+            # - If collation is not specified, we don't know what is server's
+            #   default collation for the charset. For example, default collation
+            #   of utf8mb4 is:
+            #   - MySQL 5.7, MariaDB 10.x: utf8mb4_general_ci
+            #   - MySQL 8.0: utf8mb4_0900_ai_ci
+            #
+            # Reference:
+            # - https://github.com/PyMySQL/PyMySQL/issues/1092
+            # - https://github.com/wagtail/wagtail/issues/9477
+            # - https://zenn.dev/methane/articles/2023-mysql-collation (Japanese)
             self.set_character_set(self.charset, self.collation)
 
             if self.sql_mode is not None:

singlestoredb/tests/test_basics.py

@@ -1308,6 +1308,8 @@ class TestBasics(unittest.TestCase):
             )
 
     def test_charset(self):
+        self.skipTest('Skip until charset commands are re-implemented')
+
         with s2.connect(database=type(self).dbname) as conn:
             with conn.cursor() as cur:
                 cur.execute('''

{singlestoredb-1.12.3.dist-info → singlestoredb-1.12.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: singlestoredb
-Version: 1.12.3
+Version: 1.12.4
 Summary: Interface to the SingleStoreDB database and workspace management APIs
 Home-page: https://github.com/singlestore-labs/singlestoredb-python
 Author: SingleStore

{singlestoredb-1.12.3.dist-info → singlestoredb-1.12.4.dist-info}/RECORD

@@ -1,15 +1,15 @@
-_singlestoredb_accel.abi3.so,sha256=cVmTVIA6Yi1uv4w3hPysd8XErqbm4qUD8RcUQPjb0gk,206864
-singlestoredb-1.12.3.dist-info/RECORD,,
-singlestoredb-1.12.3.dist-info/LICENSE,sha256=Mlq78idURT-9G026aMYswwwnnrLcgzTLuXeAs5hjDLM,11341
-singlestoredb-1.12.3.dist-info/WHEEL,sha256=_VEguvlLpUd-c8RbFMA4yMIVNMBv2LhpxYLCEQ-Bogk,113
-singlestoredb-1.12.3.dist-info/entry_points.txt,sha256=bSLaTWB5zGjpVYPAaI46MkkDup0su-eb3uAhCNYuRV0,48
-singlestoredb-1.12.3.dist-info/top_level.txt,sha256=lA65Vf4qAMfg_s1oG3LEO90h4t1Z-SPDbRqkevI3bSY,40
-singlestoredb-1.12.3.dist-info/METADATA,sha256=yrjRv-AXr3c1M1Zs7y0viiN7zEQJAI-0klLXqOhQ9X4,5636
+_singlestoredb_accel.abi3.so,sha256=xY1c5vTEUfKIji9QcD3fQ_saMVbafbIszYKY7i9yfzo,206864
+singlestoredb-1.12.4.dist-info/RECORD,,
+singlestoredb-1.12.4.dist-info/LICENSE,sha256=Mlq78idURT-9G026aMYswwwnnrLcgzTLuXeAs5hjDLM,11341
+singlestoredb-1.12.4.dist-info/WHEEL,sha256=_VEguvlLpUd-c8RbFMA4yMIVNMBv2LhpxYLCEQ-Bogk,113
+singlestoredb-1.12.4.dist-info/entry_points.txt,sha256=bSLaTWB5zGjpVYPAaI46MkkDup0su-eb3uAhCNYuRV0,48
+singlestoredb-1.12.4.dist-info/top_level.txt,sha256=lA65Vf4qAMfg_s1oG3LEO90h4t1Z-SPDbRqkevI3bSY,40
+singlestoredb-1.12.4.dist-info/METADATA,sha256=yw18Su4O69FjG3sYf5-SSdTQsiMhZiIa2fcGK2S4Vrs,5636
 sqlx/magic.py,sha256=JsS9_9aBFaOt91Torm1JPN0c8qB2QmYJmNSKtbSQIY0,3509
 sqlx/__init__.py,sha256=aBYiU8DZXCogvWu3yWafOz7bZS5WWwLZXj7oL0dXGyU,85
 singlestoredb/auth.py,sha256=u8D9tpKzrqa4ssaHjyZnGDX1q8XBpGtuoOkTkSv7B28,7599
 singlestoredb/config.py,sha256=0XooNOf1dUee26C0io7unfBbdXUyfDIYc_mSpxsVsTI,12592
-singlestoredb/__init__.py,sha256=LXYFwtLhjKsxv739J4mxgRFhDzBRIMM-XBnm-RqwLtk,1649
+singlestoredb/__init__.py,sha256=k2RhlWhHq2KGERDJKr9bjgAV5KCrLJl2vcEyfWJriGw,1649
 singlestoredb/types.py,sha256=FIqO1A7e0Gkk7ITmIysBy-P5S--ItbMSlYvblzqGS30,9969
 singlestoredb/connection.py,sha256=0HEpjBZXLqQwOTEfveMkgej1H3Kyof47prIHvJJZtoo,45831
 singlestoredb/pytest.py,sha256=OyF3BO9mgxenifYhOihnzGk8WzCJ_zN5_mxe8XyFPOc,9074
@@ -34,7 +34,7 @@ singlestoredb/tests/test_xdict.py,sha256=fqHspoi39nbX3fIDVkkRXcd5H50xdOsSvK0bxAM
 singlestoredb/tests/test_results.py,sha256=wg93sujwt-R9_eJCgSCElgAZhLDkIiAo3qPkPydOv78,6582
 singlestoredb/tests/test_fusion.py,sha256=EH1mRwdX2Fajsq6x2l0gBhH1YhcxtvDGIKC9HJ4sDbQ,50521
 singlestoredb/tests/test_plugin.py,sha256=qpO9wmWc62VaijN1sJ97YSYIX7I7Y5C6sY-WzwrutDQ,812
-singlestoredb/tests/test_basics.py,sha256=QMPTSgE8sVdL3q9YNfjsI6kJovHEGfsANjJRYGl1wns,48373
+singlestoredb/tests/test_basics.py,sha256=Dw1irrtf3gWN7tqGruSH6uhWi5zkmCpJl6ZMQxMqlf4,48446
 singlestoredb/tests/test_ext_func.py,sha256=OWd-CJ1Owhx72nikSWWEF2EQFCJk7vEXZM2Oy9EbYQo,37357
 singlestoredb/tests/test_connection.py,sha256=fvn-kPdeIMI9RGNz0dNk5ZmTCep1amwWQDHYfPdqO60,119699
 singlestoredb/tests/test2.ipynb,sha256=yd1PE1VK-DwiRd6mYS4_0cPBtuVkvcDtycvTwD-YnDo,218
@@ -87,7 +87,7 @@ singlestoredb/mysql/protocol.py,sha256=2GG8qTXy5npqo7z2D2K5T0S8PtoUOS-hFDEXy8VCo
 singlestoredb/mysql/cursors.py,sha256=aOLfHkj83aYZPOVuhJPkZ83CWByszIBRynq0fqSaWvY,27046
 singlestoredb/mysql/__init__.py,sha256=olUTAvkiERhDW41JXQMawkg-i0tvBEkoTkII1tt6lxU,4492
 singlestoredb/mysql/times.py,sha256=2j7purNVnJmjhOUgwUze-r3kNlCWqxjXj-jtqOzBfZI,463
-singlestoredb/mysql/connection.py,sha256=TN-_c8JSFSEnpsHNtQ_3DQyOshp-BTx2PlF8g_hDeGQ,73087
+singlestoredb/mysql/connection.py,sha256=6WlhOF-oEoF7V4bl4MTxU6qr6H15-KZvPC-snPmbXVg,73355
 singlestoredb/mysql/charset.py,sha256=-FlONDS_oAUF5B3mIgeHBPb_SCt4zHD33arUeBNctU0,10510
 singlestoredb/mysql/converters.py,sha256=CVe8SDmjbIAhy1xpQ2N5OKWw6t5eWpw-EU3QTlA0Hh0,7500
 singlestoredb/mysql/optionfile.py,sha256=DqL-rOQcqQncD5eVbPRkwZqo7Pj3Vh40VLx3E_e87TU,655