singlestoredb 0.9.2__cp36-abi3-macosx_10_9_universal2.whl → 0.9.3__cp36-abi3-macosx_10_9_universal2.whl

singlestoredb/__init__.py

@@ -13,7 +13,7 @@ Examples
 
 """
 
-__version__ = '0.9.2'
+__version__ = '0.9.3'
 
 from .alchemy import create_engine
 from .config import options, get_option, set_option, describe_option

singlestoredb/fusion/handler.py

@@ -21,8 +21,8 @@ from ..connection import Connection
 
 CORE_GRAMMAR = r'''
     ws = ~r"(\s*(/\*.*\*/)*\s*)*"
-    qs = ~r"\"([^\"]*)\"|'([^\']*)'"
-    number = ~r"-?\d+(\.\d+)?|-?\.d+"
+    qs = ~r"\"([^\"]*)\"|'([^\']*)'|`([^\`]*)`|(\S+)"
+    number = ~r"[-+]?(\d*\.)?\d+(e[-+]?\d+)?"i
     integer = ~r"-?\d+"
     comma = ws "," ws
     open_paren = ws "(" ws
@@ -32,10 +32,10 @@ CORE_GRAMMAR = r'''
 
 def get_keywords(grammar: str) -> Tuple[str, ...]:
     """Return all all-caps words from the beginning of the line."""
-    m = re.match(r'^\s*([A-Z0-9_]+(\s+|$))+', grammar)
+    m = re.match(r'^\s*([A-Z0-9_]+(\s+|$|;))+', grammar)
     if not m:
         return tuple()
-    return tuple(re.split(r'\s+', m.group(0).strip()))
+    return tuple(re.split(r'\s+', m.group(0).replace(';', '').strip()))
 
 
 def process_optional(m: Any) -> str:
@@ -322,6 +322,7 @@ class SQLHandler(NodeVisitor):
     #: Rule validation functions
     validators: Dict[str, Callable[..., Any]] = {}
 
+    _grammar: str = CORE_GRAMMAR
     _is_compiled: bool = False
 
     def __init__(self, connection: Connection):
@@ -347,6 +348,7 @@ class SQLHandler(NodeVisitor):
         cls.grammar, cls.command_key, cls.rule_info, cls.help = \
             process_grammar(grammar or cls.__doc__ or '')
 
+        cls._grammar = grammar or cls.__doc__ or ''
         cls._is_compiled = True
 
     def create_result(self) -> result.FusionSQLResult:
@@ -384,10 +386,15 @@ class SQLHandler(NodeVisitor):
         """
         type(self).compile()
         try:
-            res = self.run(self.visit(type(self).grammar.parse(sql)))
+            params = self.visit(type(self).grammar.parse(sql))
+            for k, v in params.items():
+                params[k] = self.validate_rule(k, v)
+            res = self.run(params)
             if res is not None:
                 return res
-            return result.FusionSQLResult(self.connection)
+            res = result.FusionSQLResult(self.connection)
+            res.set_rows([])
+            return res
         except ParseError as exc:
             s = str(exc)
             msg = ''
@@ -421,7 +428,7 @@ class SQLHandler(NodeVisitor):
         """
         raise NotImplementedError
 
-    def create_like_func(self, like: str) -> Callable[[str], bool]:
+    def create_like_func(self, like: Optional[str]) -> Callable[[str], bool]:
         """
         Construct a function to apply the LIKE clause.
 
@@ -457,7 +464,16 @@ class SQLHandler(NodeVisitor):
         """Quoted strings."""
         if node is None:
             return None
-        return node.match.group(1) or node.match.group(2)
+        return node.match.group(1) or node.match.group(2) or \
+            node.match.group(3) or node.match.group(4)
+
+    def visit_number(self, node: Node, visited_children: Iterable[Any]) -> Any:
+        """Numeric value."""
+        return float(node.match.group(0))
+
+    def visit_integer(self, node: Node, visited_children: Iterable[Any]) -> Any:
+        """Integer value."""
+        return int(node.match.group(0))
 
     def visit_ws(self, node: Node, visited_children: Iterable[Any]) -> Any:
         """Whitespace and comments."""
@@ -505,13 +521,10 @@ class SQLHandler(NodeVisitor):
             # Filter out stray empty strings
             out = [x for x in flatten(visited_children)[n_keywords:] if x]
 
-            if repeats:
-                return {node.expr_name: self.validate_rule(node.expr_name, out)}
+            if repeats or len(out) > 1:
+                return {node.expr_name: out}
 
-            return {
-                node.expr_name:
-                self.validate_rule(node.expr_name, out[0]) if out else True,
-            }
+            return {node.expr_name: out[0] if out else True}
 
         if hasattr(node, 'match'):
             if not visited_children and not node.match.groups():

singlestoredb/fusion/registry.py

@@ -3,7 +3,9 @@ import os
 import re
 from typing import Any
 from typing import Dict
+from typing import List
 from typing import Optional
+from typing import Tuple
 from typing import Type
 from typing import Union
 
@@ -110,3 +112,56 @@ def execute(
             raise RuntimeError(f'could not find handler for query: {sql}')
 
     return handler(connection).execute(sql)
+
+
+class ShowFusionCommandsHandler(SQLHandler):
+    """
+    SHOW FUSION COMMANDS [ like ];
+
+    # LIKE pattern
+    like = LIKE '<pattern>'
+
+    """
+
+    def run(self, params: Dict[str, Any]) -> Optional[result.FusionSQLResult]:
+        res = self.create_result()
+        res.add_field('Command', result.STRING)
+
+        is_like = self.create_like_func(params.get('like'))
+
+        data: List[Tuple[Any, ...]] = []
+        for _, v in sorted(_handlers.items()):
+            if v is type(self):
+                continue
+            if is_like(' '.join(v.command_key)):
+                data.append((v.help,))
+
+        res.set_rows(data)
+
+        return res
+
+
+ShowFusionCommandsHandler.register()
+
+
+class ShowFusionGrammarHandler(SQLHandler):
+    """
+    SHOW FUSION GRAMMAR for_query;
+
+    # Query to show grammar for
+    for_query = FOR '<query>'
+
+    """
+
+    def run(self, params: Dict[str, Any]) -> Optional[result.FusionSQLResult]:
+        res = self.create_result()
+        res.add_field('Grammar', result.STRING)
+        handler = get_handler(params['for_query'])
+        data: List[Tuple[Any, ...]] = []
+        if handler is not None:
+            data.append((handler._grammar,))
+        res.set_rows(data)
+        return res
+
+
+ShowFusionGrammarHandler.register()

singlestoredb/http/connection.py

@@ -543,7 +543,7 @@ class Cursor(connection.Cursor):
             #               precision, scale, null_ok, column_flags, charset)
 
             # Remove converters for things the JSON parser already converted
-            http_converters = dict(converters)
+            http_converters = dict(self._connection.decoders)
             http_converters.pop(4, None)
             http_converters.pop(5, None)
             http_converters.pop(6, None)
@@ -955,6 +955,9 @@ class Connection(connection.Connection):
         version = kwargs.get('version', 'v2')
         self.driver = kwargs.get('driver', 'https')
 
+        self.encoders = {k: v for (k, v) in converters.items() if type(k) is not int}
+        self.decoders = {k: v for (k, v) in converters.items() if type(k) is int}
+
         self._database = kwargs.get('database', get_option('database'))
         self._url = f'{self.driver}://{host}:{port}/api/{version}/'
         self._messages: List[Tuple[int, str]] = []

singlestoredb/tests/test_fusion.py

@@ -0,0 +1,83 @@
+#!/usr/bin/env python
+# type: ignore
+"""SingleStoreDB Fusion testing."""
+import os
+import unittest
+
+import singlestoredb as s2
+from singlestoredb.tests import utils
+
+
+class TestFusion(unittest.TestCase):
+
+    dbname: str = ''
+    dbexisted: bool = False
+
+    @classmethod
+    def setUpClass(cls):
+        sql_file = os.path.join(os.path.dirname(__file__), 'test.sql')
+        cls.dbname, cls.dbexisted = utils.load_sql(sql_file)
+
+    @classmethod
+    def tearDownClass(cls):
+        if not cls.dbexisted:
+            utils.drop_database(cls.dbname)
+
+    def setUp(self):
+        self.enabled = os.environ.get('SINGLESTOREDB_ENABLE_FUSION')
+        os.environ['SINGLESTOREDB_ENABLE_FUSION'] = '1'
+        self.conn = s2.connect(database=type(self).dbname, local_infile=True)
+        self.cur = self.conn.cursor()
+
+    def tearDown(self):
+        if self.enabled:
+            os.environ['SINGLESTOREDB_ENABLE_FUSION'] = self.enabled
+        else:
+            del os.environ['SINGLESTOREDB_ENABLE_FUSION']
+
+        try:
+            if self.cur is not None:
+                self.cur.close()
+        except Exception:
+            # traceback.print_exc()
+            pass
+
+        try:
+            if self.conn is not None:
+                self.conn.close()
+        except Exception:
+            # traceback.print_exc()
+            pass
+
+    def test_env_var(self):
+        os.environ['SINGLESTOREDB_ENABLE_FUSION'] = '0'
+
+        with self.assertRaises(s2.ProgrammingError):
+            self.cur.execute('show fusion commands')
+
+        del os.environ['SINGLESTOREDB_ENABLE_FUSION']
+
+        with self.assertRaises(s2.ProgrammingError):
+            self.cur.execute('show fusion commands')
+
+        os.environ['SINGLESTOREDB_ENABLE_FUSION'] = 'yes'
+
+        self.cur.execute('show fusion commands')
+        assert list(self.cur)
+
+    def test_show_commands(self):
+        self.cur.execute('show fusion commands')
+        cmds = [x[0] for x in self.cur.fetchall()]
+        assert cmds
+        assert [x for x in cmds if x.strip().startswith('SHOW FUSION GRAMMAR')], cmds
+
+        self.cur.execute('show fusion commands like "create%"')
+        cmds = [x[0] for x in self.cur.fetchall()]
+        assert cmds
+        assert [x for x in cmds if x.strip().startswith('CREATE')] == cmds, cmds
+
+    def test_show_grammar(self):
+        self.cur.execute('show fusion grammar for "create workspace"')
+        cmds = [x[0] for x in self.cur.fetchall()]
+        assert cmds
+        assert [x for x in cmds if x.strip().startswith('CREATE WORKSPACE')], cmds

singlestoredb/tests/test_management.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 # type: ignore
-"""SingleStoreDB HTTP connection testing."""
+"""SingleStoreDB Management API testing."""
 import os
 import pathlib
 import random

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

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

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

@@ -1,18 +1,18 @@
-_singlestoredb_accel.abi3.so,sha256=9lPUZMAFuO6P1ta_QgbpyHcAtz0lWGG2NvPeosXMu1k,155997
-singlestoredb-0.9.2.dist-info/RECORD,,
-singlestoredb-0.9.2.dist-info/LICENSE,sha256=Mlq78idURT-9G026aMYswwwnnrLcgzTLuXeAs5hjDLM,11341
-singlestoredb-0.9.2.dist-info/WHEEL,sha256=L_8uSJgNH7VmiqwHcew_IFGyTcruK-C2YxnyqVh4uE0,113
-singlestoredb-0.9.2.dist-info/top_level.txt,sha256=SDtemIXf-Kp-_F2f_S6x0db33cHGOILdAEsIQZe2LZc,35
-singlestoredb-0.9.2.dist-info/METADATA,sha256=xhp-I0kwsGSTrWrxRnHV03bYfMUo9hVKHhbLx14pCUM,7638
+_singlestoredb_accel.abi3.so,sha256=VIOjqjUMsueOx8deGP6b-mWB7seO_mZkjl1uVZBvqa0,155997
+singlestoredb-0.9.3.dist-info/RECORD,,
+singlestoredb-0.9.3.dist-info/LICENSE,sha256=Mlq78idURT-9G026aMYswwwnnrLcgzTLuXeAs5hjDLM,11341
+singlestoredb-0.9.3.dist-info/WHEEL,sha256=L_8uSJgNH7VmiqwHcew_IFGyTcruK-C2YxnyqVh4uE0,113
+singlestoredb-0.9.3.dist-info/top_level.txt,sha256=SDtemIXf-Kp-_F2f_S6x0db33cHGOILdAEsIQZe2LZc,35
+singlestoredb-0.9.3.dist-info/METADATA,sha256=1Ij3MmwwNUyUdji1btNWArhmGOqntKd0Lrkf-7i3w48,7638
 singlestoredb/auth.py,sha256=u8D9tpKzrqa4ssaHjyZnGDX1q8XBpGtuoOkTkSv7B28,7599
 singlestoredb/config.py,sha256=TLiXGoIZhYRYALY0t7_nFpiKf_yhyljXZhED4i0FHlU,7139
-singlestoredb/__init__.py,sha256=8Q63hlVGXnEzxWSEn1n_jrM6VMRwXYdYdMY6bvPz5IQ,877
+singlestoredb/__init__.py,sha256=Av8l6xYIXKaV0oS7gIN4yHQ-OmzLE15NaUKLDlGYKJA,877
 singlestoredb/types.py,sha256=FIqO1A7e0Gkk7ITmIysBy-P5S--ItbMSlYvblzqGS30,9969
 singlestoredb/connection.py,sha256=FIo-O_OpM2RD1wsONWTH1kHQNi__v6vMsS4ns0e5j_0,43985
 singlestoredb/exceptions.py,sha256=HuoA6sMRL5qiCiee-_5ddTGmFbYC9Euk8TYUsh5GvTw,3234
 singlestoredb/converters.py,sha256=aH_QhLr94i9_AjvcplTar0HfX2yi53KGxHHzJc7lSU0,12515
-singlestoredb/fusion/handler.py,sha256=Jzo04_ps9EJh-Q5qVmwuornB5-dKCqHPAg0WHJyYAM8,15598
-singlestoredb/fusion/registry.py,sha256=ROQNH3azs_F-LbBMt8BjgeZwfo85wCM9tu9tsy0tTJc,2948
+singlestoredb/fusion/handler.py,sha256=Z-gJyhFlx6m56i4A3m77dtP3SvsxT7JZ6ZvpyiVyMpc,16170
+singlestoredb/fusion/registry.py,sha256=9IhZAuPUw8zKWhN26CWrm-pJi6wlGEYzs_Alpf9XjVg,4266
 singlestoredb/fusion/__init__.py,sha256=Qo7SuqGw-l-vE8-EI2jhm6hXJkYfOLUKIws9c7LFNX0,356
 singlestoredb/fusion/result.py,sha256=8kEehzvJp0g7OyaDJfNT1qXbp1b6tBeRMcQPQo2GB48,3899
 singlestoredb/fusion/handlers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -20,11 +20,12 @@ singlestoredb/fusion/handlers/workspace.py,sha256=0X_xbP9KnW4HJ4lVshhtTcyjbGfvoy
 singlestoredb/tests/test.sql,sha256=wtHioW6SNa2nht71Bo9XQkE36-X1L6C_AZ5QyMJuvqM,9415
 singlestoredb/tests/test_xdict.py,sha256=fqHspoi39nbX3fIDVkkRXcd5H50xdOsSvK0bxAMQnaE,10408
 singlestoredb/tests/test_results.py,sha256=wg93sujwt-R9_eJCgSCElgAZhLDkIiAo3qPkPydOv78,6582
+singlestoredb/tests/test_fusion.py,sha256=sfCVjhCFJiHPTROX3ynwuKn9oQKVpaJFzFa5-DP-jGw,2541
 singlestoredb/tests/test_basics.py,sha256=rUfUGZ54xybvgp11XYWdqnUYMKa6VckB3XkX9LFnxRw,44180
 singlestoredb/tests/test_connection.py,sha256=RiE_NATLYPiMR5jWaBlcP5YddwitS6dzOHOVVOVXCSI,50741
 singlestoredb/tests/test_exceptions.py,sha256=tfr_8X2w1UmG4nkSBzWGB0C7ehrf1GAVgj6_ODaG-TM,1131
 singlestoredb/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-singlestoredb/tests/test_management.py,sha256=v3oi63-HpdhBb9Ez0pVqN_xBU--jniwlA42npef3sPY,25725
+singlestoredb/tests/test_management.py,sha256=XXHBz38DoAAuceWjDnVHRLNLwqXNCL-BV9SfmF3m5pc,25724
 singlestoredb/tests/test_udf.py,sha256=l3nZsqR6QjKH4GAujy9AHjq57rUwx9FrcRl6R1k6gSM,28864
 singlestoredb/tests/test_http.py,sha256=RXasTqBWRn__omj0eLFTJYIbZjd0PPdIV2d4Cqz0MC8,8580
 singlestoredb/tests/utils.py,sha256=76eNdYFVnsw6S3J_RaGgGQ87Rlm8pxwyYaFYXnvAEvk,4673
@@ -50,7 +51,7 @@ singlestoredb/utils/xdict.py,sha256=S9HKgrPrnu_6b7iOwa2KrW8CmU1Uqx0BWdEyogFzWbE,
 singlestoredb/utils/debug.py,sha256=0JiLA37u_9CKiDGiN9BK_PtFMUku3vIcNjERWaTNRSU,349
 singlestoredb/utils/mogrify.py,sha256=-a56IF70U6CkfadeaZgfjRSVsAD3PuqRrzPpjZlgbwY,4050
 singlestoredb/http/__init__.py,sha256=A_2ZUCCpvRYIA6YDpPy57wL5R1eZ5SfP6I1To5nfJ2s,912
-singlestoredb/http/connection.py,sha256=JGXTzG5ysfnRoGf2fkck8GjQcfwUDOyxmeZeJwKhIOA,33979
+singlestoredb/http/connection.py,sha256=KwAH-UI-SU2jBDWTeweJILnsqr0p2gHxngIbsTrpjgE,34163
 singlestoredb/mysql/protocol.py,sha256=TfG247zY7ngg03JLDzANYwpc9SIlJa_fGOeMF1lRRG0,12138
 singlestoredb/mysql/cursors.py,sha256=aWs4AzmeZJJltOmUU3GZNBWgod9nqnnFW5OHVquz5t0,21246
 singlestoredb/mysql/__init__.py,sha256=olUTAvkiERhDW41JXQMawkg-i0tvBEkoTkII1tt6lxU,4492