kaqing 2.0.52__tar.gz → 2.0.54__tar.gz

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

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

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

@@ -45,7 +45,7 @@ class SqlCompleter(Completer):
             elif state == "select_a_from_":
                 completer = TermCompleter(self.tables())
             elif state == "select_a_from_x_":
-                completer = TermCompleter(['where', 'group', 'limit'])
+                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_where_":
@@ -68,6 +68,34 @@ class SqlCompleter(Completer):
                 completer = TermCompleter(['limit'])
             elif state == "select_a_from_x_group_by_a_limit_":
                 completer = TermCompleter(['1'])
+            elif state == "select_a_from_x_inner_":
+                completer = TermCompleter(['join'])
+            elif state in ["select_a_from_x_inner_join_", "select_a_from_x_left_join_"]:
+                completer = TermCompleter(self.tables())
+            elif state == "select_a_from_x_inner_join_y,":
+                completer = TermCompleter(self.tables())
+            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'])
+            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'])
+            elif state == "select_a_from_x_inner_join_y_on_a=b_":
+                completer = TermCompleter(['where', 'group', 'limit'])
+            elif state == "select_a_from_x_left_":
+                completer = TermCompleter(['outer', 'join'])
+            elif state == "select_a_from_x_left_outer_":
+                completer = TermCompleter(['join'])
+            elif state == "select_a_from_x_right_":
+                completer = TermCompleter(['outer', 'join'])
+            elif state == "select_a_from_x_right_outer_":
+                completer = TermCompleter(['join'])
+            elif state == "select_a_from_x_full_":
+                completer = TermCompleter(['outer'])
+            elif state == "select_a_from_x_full_outer_":
+                completer = TermCompleter(['join'])
 
             elif state == "insert_":
                 completer = TermCompleter(['into'])
@@ -196,6 +224,22 @@ class SqlCompleter(Completer):
                         state = 'select_a_from_x_group'
                     elif token.ttype == T.Keyword and token.value.lower() == 'group by':
                         state = 'select_a_from_x_group_by'
+                    elif token.ttype == T.Keyword and token.value.lower() == 'inner':
+                        state = 'select_a_from_x_inner'
+                    elif token.ttype == T.Keyword and token.value.lower() == 'inner join':
+                        state = 'select_a_from_x_inner_join'
+                    elif token.ttype == T.Keyword and token.value.lower() == 'left':
+                        state = 'select_a_from_x_left'
+                    elif token.ttype == T.Keyword and token.value.lower() in ['left join', 'left outer join']:
+                        state = 'select_a_from_x_inner_join'
+                    elif token.ttype == T.Keyword and token.value.lower() == 'right':
+                        state = 'select_a_from_x_right'
+                    elif token.ttype == T.Keyword and token.value.lower() in ['right join', 'right outer join']:
+                        state = 'select_a_from_x_inner_join'
+                    elif token.ttype == T.Keyword and token.value.lower() == 'full':
+                        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_where':
                     if token.ttype == T.Text.Whitespace:
                         state = 'select_a_from_x_where_'
@@ -216,6 +260,8 @@ class SqlCompleter(Completer):
                         state = 'select_a_from_x_where'
                     elif token.ttype == T.Keyword and token.value.lower() == 'group':
                         state = 'select_a_from_x_group'
+                    elif token.ttype == T.Keyword and token.value.lower() == 'group by':
+                        state = 'select_a_from_x_group_by'
                     elif token.ttype == T.Keyword and token.value.lower() == 'limit':
                         state = 'select_a_from_x_where_id=v_limit'
                 elif state == 'select_a_from_x_group':
@@ -244,6 +290,101 @@ class SqlCompleter(Completer):
                 elif state == 'select_a_from_x_where_id=v_limit':
                     if token.ttype == T.Text.Whitespace:
                         state = 'select_a_from_x_where_id=v_limit_'
+                elif state == 'select_a_from_x_inner':
+                    if token.ttype == T.Text.Whitespace:
+                        state = 'select_a_from_x_inner_'
+                elif state == 'select_a_from_x_inner_':
+                    if token.ttype == T.Keyword and token.value.lower() == 'join':
+                        state = 'select_a_from_x_inner_join'
+                elif state == 'select_a_from_x_inner_join':
+                    if token.ttype == T.Text.Whitespace:
+                        state = 'select_a_from_x_inner_join_'
+                elif state == 'select_a_from_x_inner_join_':
+                    if token.ttype == T.Name:
+                        state = 'select_a_from_x_inner_join_y'
+
+                elif state == 'select_a_from_x_left':
+                    if token.ttype == T.Text.Whitespace:
+                        state = 'select_a_from_x_left_'
+                elif state == 'select_a_from_x_left_':
+                    if token.ttype == T.Keyword and token.value.lower() == 'join':
+                        state = 'select_a_from_x_inner_join'
+                    elif token.ttype == T.Keyword and token.value.lower() == 'outer':
+                        state = 'select_a_from_x_left_outer'
+                elif state == 'select_a_from_x_left_outer':
+                    if token.ttype == T.Text.Whitespace:
+                        state = 'select_a_from_x_left_outer_'
+                elif state == 'select_a_from_x_left_outer_':
+                    if token.ttype == T.Keyword and token.value.lower() == 'join':
+                        state = 'select_a_from_x_inner_join_'
+
+                elif state == 'select_a_from_x_right':
+                    if token.ttype == T.Text.Whitespace:
+                        state = 'select_a_from_x_right_'
+                elif state == 'select_a_from_x_right_':
+                    if token.ttype == T.Keyword and token.value.lower() == 'join':
+                        state = 'select_a_from_x_inner_join'
+                    elif token.ttype == T.Keyword and token.value.lower() == 'outer':
+                        state = 'select_a_from_x_right_outer'
+                elif state == 'select_a_from_x_right_outer':
+                    if token.ttype == T.Text.Whitespace:
+                        state = 'select_a_from_x_right_outer_'
+                elif state == 'select_a_from_x_right_outer_':
+                    if token.ttype == T.Keyword and token.value.lower() == 'join':
+                        state = 'select_a_from_x_inner_join_'
+
+                elif state == 'select_a_from_x_full':
+                    if token.ttype == T.Text.Whitespace:
+                        state = 'select_a_from_x_full_'
+                elif state == 'select_a_from_x_full_':
+                    if token.ttype == T.Keyword and token.value.lower() == 'outer':
+                        state = 'select_a_from_x_full_outer'
+                elif state == 'select_a_from_x_full_outer':
+                    if token.ttype == T.Text.Whitespace:
+                        state = 'select_a_from_x_full_outer_'
+                elif state == 'select_a_from_x_full_outer_':
+                    if token.ttype == T.Keyword and token.value.lower() == 'join':
+                        state = 'select_a_from_x_inner_join_'
+
+                elif state == 'select_a_from_x_inner_join_y':
+                    if token.ttype == T.Punctuation and token.value == ',':
+                        state = 'select_a_from_x_inner_join_y,'
+                    elif token.ttype == T.Text.Whitespace:
+                        state = 'select_a_from_x_inner_join_y_'
+                elif state == 'select_a_from_x_inner_join_y,':
+                    if token.ttype == T.Name:
+                        state = 'select_a_from_x_inner_join_y'
+                elif state == 'select_a_from_x_inner_join_y_':
+                    if token.ttype == T.Keyword and token.value.lower() == 'on':
+                        state = 'select_a_from_x_inner_join_y_on'
+                elif state == 'select_a_from_x_inner_join_y_on':
+                    if token.ttype == T.Text.Whitespace:
+                        state = 'select_a_from_x_inner_join_y_on_'
+                elif state == 'select_a_from_x_inner_join_y_on_':
+                    if token.ttype == T.Name:
+                        state = 'select_a_from_x_inner_join_y_on_a'
+                elif state == 'select_a_from_x_inner_join_y_on_a':
+                    if token.ttype == T.Operator.Comparison:
+                        state = 'select_a_from_x_inner_join_y_on_a='
+                elif state == 'select_a_from_x_inner_join_y_on_a=':
+                    if token.ttype in [T.Literal.String.Single, T.Name]:
+                        state = 'select_a_from_x_inner_join_y_on_a=b'
+                elif state == 'select_a_from_x_inner_join_y_on_a=b':
+                    if token.ttype == T.Text.Whitespace:
+                        state = 'select_a_from_x_inner_join_y_on_a=b_'
+                    elif token.ttype == T.Punctuation and token.value == ',':
+                        state = 'select_a_from_x_inner_join_y_on_'
+                elif state == 'select_a_from_x_inner_join_y_on_a=b_':
+                    if token.ttype == T.Keyword and token.value.lower() in ['and', 'or']:
+                        state = 'select_a_from_x_inner_join'
+                    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() == 'group':
+                        state = 'select_a_from_x_group'
+                    elif token.ttype == T.Keyword and token.value.lower() == 'group by':
+                        state = 'select_a_from_x_group_by'
+                    elif token.ttype == T.Keyword and token.value.lower() == 'limit':
+                        state = 'select_a_from_x_where_id=v_limit'
 
                 elif state == 'insert':
                     if token.ttype == T.Text.Whitespace:

kaqing-2.0.54/adam/version.py

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

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

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

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

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

kaqing-2.0.52/adam/version.py

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