kaqing 2.0.68__tar.gz → 2.0.70__tar.gz

{kaqing-2.0.68 → kaqing-2.0.70}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: kaqing
-Version: 2.0.68
+Version: 2.0.70
 Summary: UNKNOWN
 Home-page: UNKNOWN
 License: UNKNOWN

{kaqing-2.0.68 → kaqing-2.0.70}/adam/sql/sql_completer.py

@@ -194,10 +194,10 @@ class SqlCompleter(Completer):
             'select_a_comma_                 > name|*           > select_a                      ^ *',
             'select_a_                       > from             > select_from                   ^ from',
             'select_from_                    > name             > select_from_x                 ^ (select,tables',
-            '-                               > (                > select_from_x_lp_',
+            '-                               > {                > select_from_x_lp_',
             'select_from_x_lp_               > select           > select',
             'select_from_x                   > ,                > select_from_x_comma_',
-            '-                               > )                > select_from_x_rp_',
+            '-                               > }                > select_from_x_rp_',
             'select_from_x_rp__              > as               > select_from_x_as              ^ as',
             'select_from_x_comma_            > name             > select_from_x                 ^ tables',
             'select_from_x_                                                                     ^ as,where,inner join,left outer join,right outer join,full outer join,group by,limit',
@@ -219,6 +219,7 @@ class SqlCompleter(Completer):
             '-                               > full outer join  > select_join',
             'select_from_x_as_               > name             > select_from_x_as_x            ^ x,y,z',
             'select_from_x_as_x              > ,                > select_from_x_as_x_comma_',
+            '-                               > }                > select_where_sc_re_',
             'select_from_x_as_x_comma_       > name             > select_from_x                 ^ tables',
             'select_where_                   > name             > select_where_a                ^ id,x.,y.,z.',
             'select_where_a                  > comparison       > select_where_a_op             ^ =,<,<=,>,>=,<>,like,not,in',
@@ -237,7 +238,15 @@ class SqlCompleter(Completer):
             'select_where_a_not_op           > name|single|num  > select_where_sc               ^ single',
             'select_where_a_op               > name|single|num  > select_where_sc               ^ single',
             'select_where_sc                 > )                > select_where_sc_rp_',
-            'select_where_sc_rp__            > as               > select_from_x_as              ^ as',
+            'select_where_sc                 > }                > select_where_sc_re_',
+            'select_where_sc_re__            > as               > select_from_x_as              ^ as',
+            'select_where_sc_rp_             > }                > select_where_sc_re_',
+            'select_where_sc_rp__            > as               > select_from_x_as              ^ and,or,group by,limit',
+            '-                               > and|or           > select_where',
+            '-                               > group            > select_group',
+            '-                               > group by         > select_group_by',
+            '-                               > limit            > select_where_sc_limit',
+            '-                               > }                > select_where_sc_re_',
             'select_where_sc_                > and|or           > select_where                  ^ and,or,group by,limit',
             '-                               > group            > select_group',
             '-                               > group by         > select_group_by',
@@ -245,6 +254,7 @@ class SqlCompleter(Completer):
             'select_group_                   > by               > select_group_by               ^ by',
             'select_group_by_                > name             > select_group_by_a             ^ id,x.,y.,z.',
             'select_group_by_a               > ,                > select_group_by_a_comma_',
+            '-                               > }                > select_where_sc_re_',
             'select_group_by_a_comma_        > name             > select_group_by_a             ^ id,x.,y.,z.',
             'select_group_by_a_              > limit            > select_where_sc_limit         ^ limit',
             'select_where_sc_limit_          > num              > select_where_sc_limit_num     ^ 1',
@@ -269,6 +279,7 @@ class SqlCompleter(Completer):
             'select_x_join_y_on_a            > comparison       > select_x_join_y_on_a_op       ^ =',
             'select_x_join_y_on_a_op         > name             > select_x_join_y_on_a_op_b     ^ id,x.,y.,z.',
             'select_x_join_y_on_a_op_b       > _                > select_from_x_as_x_',
+            '-                               > }                > select_where_sc_re_',
 
 
             '                                > insert           > insert',
@@ -392,7 +403,7 @@ class SqlCompleter(Completer):
 
         return (machine, completers)
 
-    def traverse_tokens(self, text: str, tokens: list[Token], state: str = '', indent=0):
+    def traverse_tokens(self, text: str, tokens: list[Token], state: str = '', indent=0, lp_level = 0, lp_levels_to_match: set = set()):
         keywords = [
             'select', 'from', 'as', 'not', 'in', 'where',
             'and', 'or', 'group', 'by', 'group by', 'limit',
@@ -406,6 +417,20 @@ class SqlCompleter(Completer):
             'delete'
         ]
 
+        def is_opening_embrace():
+            if f'{state} > ' + '{' in self.machine[0]:
+                lp_levels_to_match.add(lp_level)
+                return '{'
+
+            return '('
+
+        def is_closing_embrace():
+            if f'{state} > ' + '}' in self.machine[0] and lp_level in lp_levels_to_match:
+                lp_levels_to_match.remove(lp_level)
+                return '}'
+
+            return ')'
+
         for token in tokens:
             if self.debug:
                 if token.ttype == T.Whitespace:
@@ -422,7 +447,7 @@ class SqlCompleter(Completer):
             # print("  " * indent + f"Token: {token.value}, Type: {token.ttype}@{token.ttype.__class__}")
 
             if token.is_group:
-                state = self.traverse_tokens(text, token.tokens, state, indent + 1)
+                state = self.traverse_tokens(text, token.tokens, state, indent + 1, lp_level)
             else:
                 it = ''
                 if (t := token.value.lower()) in keywords:
@@ -441,9 +466,12 @@ class SqlCompleter(Completer):
                     if token.value == ',':
                         it = ','
                     elif token.value == '(':
-                        it = '('
+                        it = is_opening_embrace()
+                        lp_level += 1
                     elif token.value == ')':
-                        it = ')'
+                        lp_level -= 1
+                        it = is_closing_embrace()
+
                 elif token.ttype == T.Operator.Comparison:
                     it = 'comparison'
 

{kaqing-2.0.68 → kaqing-2.0.70}/adam/sql/term_completer.py

@@ -1,6 +1,6 @@
 from typing import Callable, Iterable, List, Mapping, Optional, Pattern, Union
 
-from prompt_toolkit.completion import CompleteEvent, Completer, Completion, WordCompleter
+from prompt_toolkit.completion import CompleteEvent, Completion, WordCompleter
 from prompt_toolkit.document import Document
 from prompt_toolkit.formatted_text import AnyFormattedText
 

kaqing-2.0.70/adam/version.py

@@ -0,0 +1,5 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+__version__ = "2.0.70"  #: the working version
+__release__ = "1.0.0"  #: the release version

{kaqing-2.0.68 → kaqing-2.0.70}/kaqing.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: kaqing
-Version: 2.0.68
+Version: 2.0.70
 Summary: UNKNOWN
 Home-page: UNKNOWN
 License: UNKNOWN

{kaqing-2.0.68 → kaqing-2.0.70}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name='kaqing',
-    version='2.0.68',
+    version='2.0.70',
     packages=find_packages(),
     entry_points={
         'console_scripts': [

kaqing-2.0.68/adam/version.py

@@ -1,5 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
-__version__ = "2.0.68"  #: the working version
-__release__ = "1.0.0"  #: the release version