singlestoredb 0.9.1__cp36-abi3-win_amd64.whl → 0.9.2__cp36-abi3-win_amd64.whl

singlestoredb/management/workspace.py

@@ -1389,7 +1389,7 @@ class WorkspaceManager(Manager):
             'workspaceGroups', json=dict(
                 name=name, regionID=region,
                 adminPassword=admin_password,
-                firewallRanges=firewall_ranges,
+                firewallRanges=firewall_ranges or [],
                 expiresAt=expires_at,
                 allowAllTraffic=allow_all_traffic,
                 updateWindow=update_window,

singlestoredb/mysql/connection.py

@@ -47,6 +47,7 @@ from .protocol import (
 )
 from . import err
 from ..config import get_option
+from .. import fusion
 from ..connection import Connection as BaseConnection
 
 try:
@@ -758,10 +759,15 @@ class Connection(BaseConnection):
         """
         # if DEBUG:
         #     print("DEBUG: sending query:", sql)
-        if isinstance(sql, str):
-            sql = sql.encode(self.encoding, 'surrogateescape')
-        self._execute_command(COMMAND.COM_QUERY, sql)
-        self._affected_rows = self._read_query_result(unbuffered=unbuffered)
+        handler = fusion.get_handler(sql)
+        if handler is not None:
+            self._result = fusion.execute(self, sql, handler=handler)
+            self._affected_rows = self._result.affected_rows
+        else:
+            if isinstance(sql, str):
+                sql = sql.encode(self.encoding, 'surrogateescape')
+            self._execute_command(COMMAND.COM_QUERY, sql)
+            self._affected_rows = self._read_query_result(unbuffered=unbuffered)
         return self._affected_rows
 
     def next_result(self, unbuffered=False):

singlestoredb/mysql/constants/FIELD_TYPE.py

@@ -29,3 +29,4 @@ GEOMETRY = 255
 
 CHAR = TINY
 INTERVAL = ENUM
+BOOL = TINY

singlestoredb/tests/test_results.py

@@ -51,7 +51,7 @@ class TestResults(unittest.TestCase):
                 with conn.cursor() as cur:
                     cur.execute('select * from data')
                     out = cur.fetchone()
-                    assert type(out) == tuple, type(out)
+                    assert type(out) is tuple, type(out)
                     assert len(out) == 3, len(out)
                     cur.fetchall()
 
@@ -59,7 +59,7 @@ class TestResults(unittest.TestCase):
                     out = cur.fetchall()
                     assert len(out) == 5, len(out)
                     assert len(out[0]) == 3, len(out[0])
-                    assert type(out[0]) == tuple, type(out[0])
+                    assert type(out[0]) is tuple, type(out[0])
                     assert sorted(out) == sorted([
                         ('a', 'antelopes', 2),
                         ('b', 'bears', 2),
@@ -111,13 +111,13 @@ class TestResults(unittest.TestCase):
                 with conn.cursor() as cur:
                     cur.execute('select * from data')
                     out = cur.fetchone()
-                    assert type(out) == dict, type(out)
+                    assert type(out) is dict, type(out)
                     assert len(out) == 3, len(out)
                     cur.fetchall()
 
                     cur.execute('select * from data')
                     out = cur.fetchall()
-                    assert type(out[0]) == dict, type(out[0])
+                    assert type(out[0]) is dict, type(out[0])
                     assert len(out) == 5, len(out)
                     assert len(out[0]) == 3, len(out[0])
                     assert sorted(out, key=lambda x: x['id']) == sorted(
@@ -139,13 +139,13 @@ class TestResults(unittest.TestCase):
                 with conn.cursor() as cur:
                     cur.execute('select * from data')
                     out = cur.fetchone()
-                    assert type(out) == pd.DataFrame, type(out)
+                    assert type(out) is pd.DataFrame, type(out)
                     assert len(out) == 1, len(out)
                     cur.fetchall()
 
                     cur.execute('select * from data')
                     out = cur.fetchall()
-                    assert type(out) == pd.DataFrame, type(out)
+                    assert type(out) is pd.DataFrame, type(out)
                     assert len(out) == 5, len(out)
                     out = out.sort_values('id').reset_index(drop=True)
                     exp = pd.DataFrame(

singlestoredb/utils/mogrify.py

@@ -0,0 +1,151 @@
+#!/usr/bin/env python3
+from typing import Any
+from typing import Dict
+from typing import Optional
+from typing import Sequence
+from typing import Union
+
+from ..mysql import converters
+from ..mysql.constants import SERVER_STATUS
+
+
+Encoders = converters.Encoders
+
+
+def escape(
+    obj: Any,
+    charset: str = 'utf8',
+    mapping: Optional[Encoders] = None,
+    server_status: int = 0,
+    binary_prefix: bool = False,
+) -> str:
+    """
+    Escape whatever value is passed.
+
+    Non-standard, for internal use; do not use this in your applications.
+
+    """
+    dtype = type(obj)
+    if dtype is str or isinstance(obj, str):
+        return "'{}'".format(escape_string(obj, server_status=server_status))
+    if dtype is bytes or dtype is bytearray or isinstance(obj, (bytes, bytearray)):
+        return _quote_bytes(
+            obj,
+            server_status=server_status,
+            binary_prefix=binary_prefix,
+        )
+    if mapping is None:
+        mapping = converters.encoders
+    return converters.escape_item(obj, charset, mapping=mapping)
+
+
+def literal(
+    obj: Any,
+    charset: str = 'utf8',
+    encoders: Optional[Encoders] = None,
+    server_status: int = 0,
+    binary_prefix: bool = False,
+) -> str:
+    """
+    Alias for escape().
+
+    Non-standard, for internal use; do not use this in your applications.
+
+    """
+    return escape(
+        obj, charset=charset, mapping=encoders,
+        server_status=server_status, binary_prefix=binary_prefix,
+    )
+
+
+def escape_string(
+    s: str,
+    server_status: int = 0,
+) -> str:
+    """Escape a string value."""
+    if server_status & SERVER_STATUS.SERVER_STATUS_NO_BACKSLASH_ESCAPES:
+        return s.replace("'", "''")
+    return converters.escape_string(s)
+
+
+def _quote_bytes(
+    s: bytes,
+    server_status: int = 0,
+    binary_prefix: bool = False,
+) -> str:
+    if server_status & SERVER_STATUS.SERVER_STATUS_NO_BACKSLASH_ESCAPES:
+        if binary_prefix:
+            return "_binary X'{}'".format(s.hex())
+        return "X'{}'".format(s.hex())
+    return converters.escape_bytes(s)
+
+
+def _escape_args(
+    args: Union[Sequence[Any], Dict[str, Any], None],
+    charset: str = 'utf8',
+    encoders: Optional[Encoders] = None,
+    server_status: int = 0,
+    binary_prefix: bool = False,
+) -> Any:
+    if encoders is None:
+        encoders = converters.encoders
+
+    if isinstance(args, (tuple, list)):
+        return tuple(
+            literal(
+                arg, charset=charset, encoders=encoders,
+                server_status=server_status,
+                binary_prefix=binary_prefix,
+            ) for arg in args
+        )
+
+    elif isinstance(args, dict):
+        return {
+            key: literal(
+                val, charset=charset, encoders=encoders,
+                server_status=server_status,
+                binary_prefix=binary_prefix,
+            ) for (key, val) in args.items()
+        }
+
+    # If it's not a dictionary let's try escaping it anyways.
+    # Worst case it will throw a Value error
+    return escape(
+        args, charset=charset, mapping=encoders,
+        server_status=server_status, binary_prefix=binary_prefix,
+    )
+
+
+def mogrify(
+    query: Union[str, bytes],
+    args: Union[Sequence[Any], Dict[str, Any], None] = None,
+    charset: str = 'utf8',
+    encoders: Optional[Encoders] = None,
+    server_status: int = 0,
+    binary_prefix: bool = False,
+) -> Union[str, bytes]:
+    """
+    Returns the exact string sent to the database by calling the execute() method.
+
+    This method follows the extension to the DB API 2.0 followed by Psycopg.
+
+    Parameters
+    ----------
+    query : str
+        Query to mogrify.
+    args : Sequence[Any] or Dict[str, Any] or Any, optional
+        Parameters used with query. (optional)
+
+    Returns
+    -------
+    str : The query with argument binding applied.
+
+    """
+    if args:
+        query = query % _escape_args(
+            args, charset=charset,
+            encoders=encoders,
+            server_status=server_status,
+            binary_prefix=binary_prefix,
+        )
+    return query

{singlestoredb-0.9.1.dist-info → singlestoredb-0.9.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: singlestoredb
-Version: 0.9.1
+Version: 0.9.2
 Summary: Interface to the SingleStoreDB database and workspace management APIs
 Home-page: https://github.com/singlestore-labs/singlestoredb-python
 Author: SingleStore
@@ -16,6 +16,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: PyJWT
 Requires-Dist: build
+Requires-Dist: parsimonious
 Requires-Dist: requests
 Requires-Dist: sqlparams
 Requires-Dist: wheel

{singlestoredb-0.9.1.dist-info → singlestoredb-0.9.2.dist-info}/RECORD

@@ -1,5 +1,5 @@
-_singlestoredb_accel.pyd,sha256=0Sl7n7G6TXYuXZKn0_Di5V-fUR2HT-hG4eMOdPs5WoQ,37376
-singlestoredb/__init__.py,sha256=fakJQ_cRNOiv9DB0CNIJISqTvBGY7hZV8klG2CfFRHo,909
+_singlestoredb_accel.pyd,sha256=XsmhxHVwW13ZYLgfK4S3Tm5n6qk9xVsYp9p44d8953k,37376
+singlestoredb/__init__.py,sha256=9rGI34yrB6tPF6m8t6cpWfnimKnzT2X_cUu5wo3IOss,909
 singlestoredb/auth.py,sha256=RmYiH0Wlc2RXc4pTlRMysxtBI445ggCIwojWKC_eDLE,7844
 singlestoredb/config.py,sha256=-n8HA5_KlwFxcOnfqnLobDbIA43sMlLiVr-YmvtG3a0,7397
 singlestoredb/connection.py,sha256=XeuKeM0ihbF1QIlDn2AxnJfT5d-RNCch56q0z3dn9g8,45409
@@ -15,8 +15,14 @@ singlestoredb/functions/ext/__init__.py,sha256=NrwbyL86NeG_Kv1N23R4VwL1Ap-pY9Z1B
 singlestoredb/functions/ext/asgi.py,sha256=LFrcZL2R7sgXflWqx-wcCYRIlivywqBg1joDrGUplSg,11319
 singlestoredb/functions/ext/json.py,sha256=7dncClZrC1X42GbKzVgV5jgExdbI7GQq0BGSDB9NuTM,1107
 singlestoredb/functions/ext/rowdat_1.py,sha256=70KSVL7E2842uMWOa-pygbLFd8GyZqOviEFwFacadDs,3296
+singlestoredb/fusion/__init__.py,sha256=FHWtrg6OJFTf6Ye197V5sU6ssryr2h6FBcDIgXP7-H4,367
+singlestoredb/fusion/handler.py,sha256=F6X4bSdYy870XXQVucXwNeaRdnWGyOvIf53ucg-uVPE,16140
+singlestoredb/fusion/registry.py,sha256=uL2Myucxlw6m6jfVq4oWiNW0nuL1ZLIwMdrKgqwXzuM,3060
+singlestoredb/fusion/result.py,sha256=K5WOm4_COuWXo-YxL0wjodfLhjO_X5Fdp34TrX9_FZI,4019
+singlestoredb/fusion/handlers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+singlestoredb/fusion/handlers/workspace.py,sha256=PLxIM0747WN7tbQ_QMxQG_YvSSL_UqCoijMFwH2xfuA,10893
 singlestoredb/http/__init__.py,sha256=4cEDvLloGc3LSpU-PnIwacyu0n5oIIIE6xk2SPyWD_w,939
-singlestoredb/http/connection.py,sha256=I3m_xT7jKbEkfU05j3xOB2JZbXapAjDeup-7b0pxGdQ,33515
+singlestoredb/http/connection.py,sha256=1PWiP0rD-uj224Lzt6tKLfpWPWeq-u6YvXwRp1S9nbU,35072
 singlestoredb/management/__init__.py,sha256=pRxBjzZxNjnuAtBlv4WwYZF-2Z3dbrKoy5XilJRXT2w,102
 singlestoredb/management/billing_usage.py,sha256=0UHFSPCrN0nyeGFFM-HXS3NP8pYmYo2BCCahDEPXvzg,3883
 singlestoredb/management/cluster.py,sha256=dqozXaM8kneKTFlUg92gjw6oIT6sPsoYWwJ8aefsVCo,14611
@@ -24,11 +30,11 @@ singlestoredb/management/manager.py,sha256=6-fKCB-3biMFQqk1fQtI5ZiYcX2pKMs0jD0sB
 singlestoredb/management/organization.py,sha256=iz5Mde0lat3EYLpwNDbnS0ytI33O6tG6-wYDL4-TGdM,2200
 singlestoredb/management/region.py,sha256=oGoLLS88dE1GmY7GCc0BV7X3f7bWwKQyeXOVBFmK9Pk,1678
 singlestoredb/management/utils.py,sha256=wAJaLRm7B7urG6MDkALZXxVa-kKmidXQk_-ezuppv5U,6270
-singlestoredb/management/workspace.py,sha256=CuwLwqY5PIQIONne3XiycEzXwToOJ3U_q5D1y3TkiKc,47132
+singlestoredb/management/workspace.py,sha256=yEI0epRCBLtWTnHLDO8WhHnsYrLpC4CLjHvwf-z9gNs,47138
 singlestoredb/mysql/__init__.py,sha256=CbpwzNUJPAmKPpIobC0-ugBta_RgHCMq7X7N75QLReY,4669
 singlestoredb/mysql/_auth.py,sha256=YaqqyvAHmeraBv3BM207rNveUVPM-mPnW20ts_ynVWg,8341
 singlestoredb/mysql/charset.py,sha256=mnCdMpvdub1S2mm2PSk2j5JddgsWRjsVLtGx-y9TskE,10724
-singlestoredb/mysql/connection.py,sha256=jZz7AqKutLe2Bf5H7_fFIsClaH4GrAxwIUab0_KZ7n4,63866
+singlestoredb/mysql/connection.py,sha256=KD7edphkdSy5Ijj0hbpCe4Mmu4MudC2wKtCnRVrlA4A,64129
 singlestoredb/mysql/converters.py,sha256=vebFFm6IrC0WgY-5Eh-esaPizY5cq3vDOUlEKGaYM-U,7771
 singlestoredb/mysql/cursors.py,sha256=t3t5-Iq5lOwyh-Qj3jVimEUIrljewHkOPaK01Dl5xsk,21959
 singlestoredb/mysql/err.py,sha256=aDbmfq08gWVmfgIea735wSeiFdvYbB5wusgd3qTVq1s,2480
@@ -39,7 +45,7 @@ singlestoredb/mysql/constants/CLIENT.py,sha256=hAo5tQqhc1V7t7tdNd4s6TINwYoDHldys
 singlestoredb/mysql/constants/COMMAND.py,sha256=T81MAx6Vkxf5-86PTk2OtENoXtaFSlEckBzzwrI9uXQ,711
 singlestoredb/mysql/constants/CR.py,sha256=qCE-3R28NHhkyVwhgwgxQK0XX_bZyGtTlvNa3UWaXv0,2383
 singlestoredb/mysql/constants/ER.py,sha256=FuZGMUaHPJzXNxcEsQUfQNtVEMYzYUXRvPDJnVOxXyQ,12770
-singlestoredb/mysql/constants/FIELD_TYPE.py,sha256=bJNsusotD7U1tvXNjIk_ynQXXepJFlGnYUacJaD26P0,401
+singlestoredb/mysql/constants/FIELD_TYPE.py,sha256=MWFwixlGMvI3tBq0dTknwvoza9krqVS3aZa7EMivZIU,414
 singlestoredb/mysql/constants/FLAG.py,sha256=CbdDkHclXsvS-NdAvrFhFzby4BAVpvq0tIPOszHAqgA,229
 singlestoredb/mysql/constants/SERVER_STATUS.py,sha256=W4UYyw1AW0brlgywTBaE6cm6eGq6NBvHK8iCAh2mQhM,343
 singlestoredb/mysql/constants/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -76,7 +82,7 @@ singlestoredb/tests/test_dbapi.py,sha256=cNJoTEZvYG7ckcwT7xqlkJX-2TDEYGTDDU1Iguc
 singlestoredb/tests/test_exceptions.py,sha256=vscMYmdOJr0JmkTAJrNI2w0Q96Nfugjkrt5_lYnw8i0,1176
 singlestoredb/tests/test_http.py,sha256=7hwXe61hlUes3nji0MTTZweo94tJAlJ-vA5ct9geXFQ,8868
 singlestoredb/tests/test_management.py,sha256=XSYmKBEyRz_mLRiJyx1ntlK-95ivuQnB9D9j0MeRrWs,26513
-singlestoredb/tests/test_results.py,sha256=cyT0dgF3aQ5CSjmzWW_oqJo4JrHmT4UWAl1J41O63rM,6753
+singlestoredb/tests/test_results.py,sha256=Zg1ynZFRZqalAMfNLOU5C6BDXaox6JxrKm_XZwVNFcg,6753
 singlestoredb/tests/test_types.py,sha256=YeVE6KPqlqzJke-4hbRmc8ko1E7RLHu5S8qLg04Bl5Y,4632
 singlestoredb/tests/test_udf.py,sha256=6fGNQELY6KKvUUUmi6StTGw-jZUMGrVXTpfZf61bwFw,29562
 singlestoredb/tests/test_xdict.py,sha256=5ArRJqd5aNXkPK7Y6sFeRbqZ59MZ1YaGBpSlDAbBrjM,10741
@@ -85,10 +91,11 @@ singlestoredb/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSu
 singlestoredb/utils/config.py,sha256=WVQ567ZzqzlTGueQH5fEpm5tPZuz8y7qvpEQUB-vPjk,25453
 singlestoredb/utils/convert_rows.py,sha256=gkZeZazeJvimCYEQ1FdAC-AmMDwmFGCuP6mi653bpns,1885
 singlestoredb/utils/debug.py,sha256=y7dnJeJGt3U_BWXz9pLt1qNQREpPtumYX_sk1DiqG6Y,362
+singlestoredb/utils/mogrify.py,sha256=gCcn99-vgsGVjTUV7RHJ6hH4vCNrsGB_Xo4z8kiSPDQ,4201
 singlestoredb/utils/results.py,sha256=ely2XVAHHejObjLibS3UcrPOuCO2g5aRtA3PxAMtE-g,5432
 singlestoredb/utils/xdict.py,sha256=-wi1lSPTnY99fhVMBhPKJ8cCsQhNG4GMUfkEBDKYgCw,13321
-singlestoredb-0.9.1.dist-info/LICENSE,sha256=Bojenzui8aPNjlF3w4ojguDP7sTf8vFV_9Gc2UAG1sg,11542
-singlestoredb-0.9.1.dist-info/METADATA,sha256=YGBU-RmVKRzn8jTGodZIDqUQSH2Cby5gwMaUVqoHnrU,7764
-singlestoredb-0.9.1.dist-info/WHEEL,sha256=CFPxCuvaTIZS0h5c8o2xFStPFn1i6Rraxc2uR61QpoA,100
-singlestoredb-0.9.1.dist-info/top_level.txt,sha256=SDtemIXf-Kp-_F2f_S6x0db33cHGOILdAEsIQZe2LZc,35
-singlestoredb-0.9.1.dist-info/RECORD,,
+singlestoredb-0.9.2.dist-info/LICENSE,sha256=Bojenzui8aPNjlF3w4ojguDP7sTf8vFV_9Gc2UAG1sg,11542
+singlestoredb-0.9.2.dist-info/METADATA,sha256=1psiVY-gct4A569NxnKOvAWdPv5bHkTPHt9dR-yynXo,7793
+singlestoredb-0.9.2.dist-info/WHEEL,sha256=CFPxCuvaTIZS0h5c8o2xFStPFn1i6Rraxc2uR61QpoA,100
+singlestoredb-0.9.2.dist-info/top_level.txt,sha256=SDtemIXf-Kp-_F2f_S6x0db33cHGOILdAEsIQZe2LZc,35
+singlestoredb-0.9.2.dist-info/RECORD,,