singlestoredb 0.9.2__cp36-abi3-win_amd64.whl → 0.9.3__cp36-abi3-win_amd64.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,5 +1,5 @@
-_singlestoredb_accel.pyd,sha256=XsmhxHVwW13ZYLgfK4S3Tm5n6qk9xVsYp9p44d8953k,37376
-singlestoredb/__init__.py,sha256=9rGI34yrB6tPF6m8t6cpWfnimKnzT2X_cUu5wo3IOss,909
+_singlestoredb_accel.pyd,sha256=oVCTUXoHbcAJhDASVeczCSA1-hWY33z8jk1M7AlvKxI,37376
+singlestoredb/__init__.py,sha256=uPSaY4xDxpO0orU6aqssT93B24ItTyVzGvhv4tgZSOc,909
 singlestoredb/auth.py,sha256=RmYiH0Wlc2RXc4pTlRMysxtBI445ggCIwojWKC_eDLE,7844
 singlestoredb/config.py,sha256=-n8HA5_KlwFxcOnfqnLobDbIA43sMlLiVr-YmvtG3a0,7397
 singlestoredb/connection.py,sha256=XeuKeM0ihbF1QIlDn2AxnJfT5d-RNCch56q0z3dn9g8,45409
@@ -16,13 +16,13 @@ singlestoredb/functions/ext/asgi.py,sha256=LFrcZL2R7sgXflWqx-wcCYRIlivywqBg1joDr
 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/handler.py,sha256=bJRJFX-j70J3aSfAaeX38AkfV_WlwL-wWU--T5JBYjc,16725
+singlestoredb/fusion/registry.py,sha256=0suBgQ87A85sCZWGWlzBoIIZxbcL18wnrt280w01qJU,4433
 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=1PWiP0rD-uj224Lzt6tKLfpWPWeq-u6YvXwRp1S9nbU,35072
+singlestoredb/http/connection.py,sha256=uVbHgjcU28uHf4sMpJD8UIqzcFVPmJQAcE_ikDTr_GQ,35259
 singlestoredb/management/__init__.py,sha256=pRxBjzZxNjnuAtBlv4WwYZF-2Z3dbrKoy5XilJRXT2w,102
 singlestoredb/management/billing_usage.py,sha256=0UHFSPCrN0nyeGFFM-HXS3NP8pYmYo2BCCahDEPXvzg,3883
 singlestoredb/management/cluster.py,sha256=dqozXaM8kneKTFlUg92gjw6oIT6sPsoYWwJ8aefsVCo,14611
@@ -80,8 +80,9 @@ singlestoredb/tests/test_config.py,sha256=Ad0PDmCnJMOyy9f7WTKiRasSR_3mYRByUlSb7k
 singlestoredb/tests/test_connection.py,sha256=0GRvsvUz8G2I5ah0lHI97XUVv6UI13A1D5UNHk7RRmc,52215
 singlestoredb/tests/test_dbapi.py,sha256=cNJoTEZvYG7ckcwT7xqlkJX-2TDEYGTDDU1Igucp48k,679
 singlestoredb/tests/test_exceptions.py,sha256=vscMYmdOJr0JmkTAJrNI2w0Q96Nfugjkrt5_lYnw8i0,1176
+singlestoredb/tests/test_fusion.py,sha256=g7sLQUJgHRDe48SWDfFPrx0onbh4qAVjQ_sEp8-VGBs,2624
 singlestoredb/tests/test_http.py,sha256=7hwXe61hlUes3nji0MTTZweo94tJAlJ-vA5ct9geXFQ,8868
-singlestoredb/tests/test_management.py,sha256=XSYmKBEyRz_mLRiJyx1ntlK-95ivuQnB9D9j0MeRrWs,26513
+singlestoredb/tests/test_management.py,sha256=jvT38o-nYGmzk260NS8j9Bit2kBv24CSloG3CJmcQVs,26512
 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
@@ -94,8 +95,8 @@ singlestoredb/utils/debug.py,sha256=y7dnJeJGt3U_BWXz9pLt1qNQREpPtumYX_sk1DiqG6Y,
 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.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,,
+singlestoredb-0.9.3.dist-info/LICENSE,sha256=Bojenzui8aPNjlF3w4ojguDP7sTf8vFV_9Gc2UAG1sg,11542
+singlestoredb-0.9.3.dist-info/METADATA,sha256=3Kv3yUR-JCqYGCvlmCsSX5MJdhG4lvh8tGpnfetigXI,7793
+singlestoredb-0.9.3.dist-info/WHEEL,sha256=CFPxCuvaTIZS0h5c8o2xFStPFn1i6Rraxc2uR61QpoA,100
+singlestoredb-0.9.3.dist-info/top_level.txt,sha256=SDtemIXf-Kp-_F2f_S6x0db33cHGOILdAEsIQZe2LZc,35
+singlestoredb-0.9.3.dist-info/RECORD,,