kaqing 2.0.54__tar.gz → 2.0.56__tar.gz

{kaqing-2.0.54 → kaqing-2.0.56}/PKG-INFO

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

{kaqing-2.0.54 → kaqing-2.0.56}/adam/sql/sql_completer.py

@@ -7,7 +7,10 @@ from sqlparse import tokens as T
 
 from adam.sql.term_completer import TermCompleter
 
+columns = TermCompleter(['id', 'x.', 'y.', 'z.'])
+
 class SqlCompleter(Completer):
+
     def __init__(self, tables: Callable[[], list[str]], dml: str = None, debug = False):
         super().__init__()
         self.dml = dml
@@ -45,11 +48,17 @@ class SqlCompleter(Completer):
             elif state == "select_a_from_":
                 completer = TermCompleter(self.tables())
             elif state == "select_a_from_x_":
+                completer = TermCompleter(['as', 'where', 'inner', 'left', 'right', 'full', 'group', 'limit'])
+            elif state == "select_a_from_x_as_x_":
                 completer = TermCompleter(['where', 'inner', 'left', 'right', 'full', 'group', 'limit'])
             elif state == "select_a_from_x,":
                 completer = TermCompleter(self.tables())
+            elif state == "select_a_from_x_as_":
+                completer = TermCompleter(['x', 'y', 'z'])
+            elif state == "select_a_from_x_as_x,":
+                completer = TermCompleter(self.tables())
             elif state == "select_a_from_x_where_":
-                completer = TermCompleter(['id'])
+                completer = columns
             elif state == "select_a_from_x_where_id":
                 completer = TermCompleter(['=', '<', '<=', '>', '>=', '<>', 'like'])
             elif state == "select_a_from_x_where_id=":
@@ -61,9 +70,9 @@ class SqlCompleter(Completer):
             elif state == "select_a_from_x_group_":
                 completer = TermCompleter(['by'])
             elif state == "select_a_from_x_group_by_":
-                completer = TermCompleter(['id'])
+                completer = columns
             elif state == "select_a_from_x_group_by_a,":
-                completer = TermCompleter(['id'])
+                completer = columns
             elif state == "select_a_from_x_group_by_a_":
                 completer = TermCompleter(['limit'])
             elif state == "select_a_from_x_group_by_a_limit_":
@@ -77,11 +86,11 @@ class SqlCompleter(Completer):
             elif state == "select_a_from_x_inner_join_y_":
                 completer = TermCompleter(['on'])
             elif state == "select_a_from_x_inner_join_y_on_":
-                completer = TermCompleter(['id'])
+                completer = columns
             elif state == "select_a_from_x_inner_join_y_on_a":
                 completer = TermCompleter(['='])
             elif state == "select_a_from_x_inner_join_y_on_a=":
-                completer = TermCompleter(['id'])
+                completer = columns
             elif state == "select_a_from_x_inner_join_y_on_a=b_":
                 completer = TermCompleter(['where', 'group', 'limit'])
             elif state == "select_a_from_x_left_":
@@ -104,9 +113,9 @@ class SqlCompleter(Completer):
             elif state == "insert_into_x_":
                 completer = TermCompleter(['values'])
             elif state == "insert_into_x(":
-                completer = TermCompleter(['id'])
+                completer = columns
             elif state == "insert_into_x(a,":
-                completer = TermCompleter(['id'])
+                completer = columns
             elif state == "insert_into_x(a)_":
                 completer = TermCompleter(['values('])
             elif state == "insert_into_x_values":
@@ -119,7 +128,7 @@ class SqlCompleter(Completer):
             elif state == "update_x_":
                 completer = TermCompleter(['set'])
             elif state in ["update_x_set_", "update_x_set_a=v,"]:
-                completer = TermCompleter(['id'])
+                completer = columns
             elif state == "update_x_set_a":
                 completer = TermCompleter(['='])
             elif state == "update_x_set_a=":
@@ -127,7 +136,7 @@ class SqlCompleter(Completer):
             elif state == "update_x_set_a=v_":
                 completer = TermCompleter(['where'])
             elif state == "update_x_set_a=v_where_":
-                completer = TermCompleter(['id'])
+                completer = columns
             elif state == "update_x_set_a=v_where_id":
                 completer = TermCompleter(['='])
             elif state == "update_x_set_a=v_where_id=v_":
@@ -140,7 +149,7 @@ class SqlCompleter(Completer):
             elif state == "delete_from_x_":
                 completer = TermCompleter(['where'])
             elif state == "delete_from_x_where_":
-                completer = TermCompleter(['id'])
+                completer = columns
             elif state == "delete_from_x_where_id":
                 completer = TermCompleter(['='])
             elif state == "delete_from_x_where_id=":
@@ -215,8 +224,12 @@ class SqlCompleter(Completer):
                 elif state == 'select_a_from_x,':
                     if token.ttype == T.Name:
                         state = 'select_a_from_x'
-                elif state == 'select_a_from_x_':
-                    if token.ttype == T.Keyword and token.value.lower() == 'where':
+                elif state in ['select_a_from_x_', 'select_a_from_x_as_x_']:
+                    if token.ttype == T.Punctuation and token.value == ',':
+                        state = 'select_a_from_x,'
+                    elif token.ttype == T.Keyword and token.value.lower() == 'as':
+                        state = 'select_a_from_x_as'
+                    elif token.ttype == T.Keyword and token.value.lower() == 'where':
                         state = 'select_a_from_x_where'
                     elif token.ttype == T.Keyword and token.value.lower() == 'limit':
                         state = 'select_a_from_x_where_id=v_limit'
@@ -240,6 +253,20 @@ class SqlCompleter(Completer):
                         state = 'select_a_from_x_full'
                     elif token.ttype == T.Keyword and token.value.lower() == 'full outer join':
                         state = 'select_a_from_x_inner_join'
+                elif state == 'select_a_from_x_as':
+                    if token.ttype == T.Text.Whitespace:
+                        state = 'select_a_from_x_as_'
+                elif state == 'select_a_from_x_as_':
+                    if token.ttype == T.Name:
+                        state = 'select_a_from_x_as_x'
+                elif state == 'select_a_from_x_as_x':
+                    if token.ttype == T.Text.Whitespace:
+                        state = 'select_a_from_x_as_x_'
+                    elif token.ttype == T.Punctuation and token.value == ',':
+                        state = 'select_a_from_x_as_x,'
+                elif state == 'select_a_from_x_as_x,':
+                    if token.ttype == T.Name:
+                        state = 'select_a_from_x'
                 elif state == 'select_a_from_x_where':
                     if token.ttype == T.Text.Whitespace:
                         state = 'select_a_from_x_where_'

{kaqing-2.0.54 → kaqing-2.0.56}/adam/sql/term_completer.py

@@ -46,15 +46,22 @@ class TermCompleter(WordCompleter):
             if self.ignore_case:
                 word = word.lower()
 
-            if word_before_cursor in ['(', ',', '=']:
-                return True
-
             if self.match_middle:
                 return word_before_cursor in word
             else:
                 return word.startswith(word_before_cursor)
 
         for a in words:
+            if word_before_cursor in ['(', ',', '=']:
+                display = self.display_dict.get(a, a)
+                display_meta = self.meta_dict.get(a, "")
+                yield Completion(
+                    a,
+                    0,
+                    display=display,
+                    display_meta=display_meta,
+                )
+
             if word_matches(a):
                 display = self.display_dict.get(a, a)
                 display_meta = self.meta_dict.get(a, "")

kaqing-2.0.56/adam/version.py

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

{kaqing-2.0.54 → kaqing-2.0.56}/kaqing.egg-info/PKG-INFO

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

{kaqing-2.0.54 → kaqing-2.0.56}/kaqing.egg-info/SOURCES.txt

@@ -167,7 +167,6 @@ adam/k8s_utils/statefulsets.py
 adam/k8s_utils/volumes.py
 adam/sql/__init__.py
 adam/sql/sql_completer.py
-adam/sql/sql_utils.py
 adam/sql/term_completer.py
 adam/sso/__init__.py
 adam/sso/authenticator.py

{kaqing-2.0.54 → kaqing-2.0.56}/setup.py

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

kaqing-2.0.54/adam/sql/sql_utils.py

@@ -1,5 +0,0 @@
-import re
-
-def safe_terms(text: str):
-    tokens = re.findall(r'"[^"]+"|\b\w+\b|\S', text)
-    return tokens, len(tokens) > 1 or text.startswith(' ') or text.endswith(' ')

kaqing-2.0.54/adam/version.py

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