kaqing 2.0.52__py3-none-any.whl → 2.0.54__py3-none-any.whl

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:

adam/version.py

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

{kaqing-2.0.52.dist-info → kaqing-2.0.54.dist-info}/METADATA

@@ -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.dist-info → kaqing-2.0.54.dist-info}/RECORD

@@ -14,7 +14,7 @@ adam/repl_commands.py,sha256=WA90Rl27Juctzr3U3kfCDk5N-oYMKlfWbZeafUgk7k0,4723
 adam/repl_session.py,sha256=uIogcvWBh7wd8QQ-p_JgLsyJ8YJgINw5vOd6JIsd7Vo,472
 adam/repl_state.py,sha256=591d7gV6uQSFtm7IWdlIYAHjfAzs9bdvIkwlIAeKddE,7540
 adam/utils.py,sha256=2DoWsrcaioFFH0-RjT30qelVRPUJqCGTfz_ucfE7F8g,7406
-adam/version.py,sha256=XuB7qBTgPGUBgntooinFIUEzyfWtUK6mwU7fulvU4YA,139
+adam/version.py,sha256=gHQU0p0b0eVDUQ_bZeKqVTG7vyLS7Qcu9lOBB9eVEEk,139
 adam/checks/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 adam/checks/check.py,sha256=Qopr3huYcMu2bzQgb99dEUYjFzkjKHRI76S6KA9b9Rk,702
 adam/checks/check_context.py,sha256=FEHkQ32jY1EDopQ2uYWqy9v7aEEX1orLpJWhopwAlh4,402
@@ -164,7 +164,7 @@ adam/k8s_utils/services.py,sha256=EOJJGACVbbRvu5T3rMKqIJqgYic1_MSJ17EA0TJ6UOk,31
 adam/k8s_utils/statefulsets.py,sha256=hiBOmJZ3KTI6_naAFzNoW1NoYnnBG35BZ7RMdPhNC6o,4664
 adam/k8s_utils/volumes.py,sha256=RIBmlOSWM3V3QVXLCFT0owVOyh4rGG1ETp521a-6ndo,1137
 adam/sql/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-adam/sql/sql_completer.py,sha256=RhfE8_ecn84HtiCFPMDvKrkPySFXVIJ2ez9bN8-wdP4,20902
+adam/sql/sql_completer.py,sha256=rl7UlL5kthXOmcPBK3LFD1H0S2yDZMIQPbov1x8Wo9w,29819
 adam/sql/sql_utils.py,sha256=MLoxB9h22WZiANu0SZzmBJcY2gtb6f_D4jnoJEjLgPc,171
 adam/sql/term_completer.py,sha256=O-sUxFVc1DJmPQCdT-XPK2SSkUe4AL1dw8ZPXXicATY,2273
 adam/sso/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -177,8 +177,8 @@ adam/sso/idp.py,sha256=fvcwUw_URTgsO6ySaqTIw0zQT2qRO1IPSGhf6rPtybo,5804
 adam/sso/idp_login.py,sha256=QAtCUeDTVWliJy40RK_oac8Vgybr13xH8wzeBoxPaa8,1754
 adam/sso/idp_session.py,sha256=9BUHNRf70u4rVKrVY1HKPOEmOviXvkjam8WJxmXSKIM,1735
 adam/sso/sso_config.py,sha256=5N8WZgIJQBtHUy585XLRWKjpU87_v6QluyNK9E27D5s,2459
-kaqing-2.0.52.dist-info/METADATA,sha256=9kOILJT7zBE10svPfC_xsbhrbuvc9_f8_XYyL28MEsE,132
-kaqing-2.0.52.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-kaqing-2.0.52.dist-info/entry_points.txt,sha256=SkzhuQJUWsXOzHeZ5TgQ2c3_g53UGK23zzJU_JTZOZI,39
-kaqing-2.0.52.dist-info/top_level.txt,sha256=8_2PZkwBb-xDcnc8a2rAbQeJhXKXskc7zTP7pSPa1fw,5
-kaqing-2.0.52.dist-info/RECORD,,
+kaqing-2.0.54.dist-info/METADATA,sha256=rIJFcVCPaapCX70brT2uyipB1Ma7K_ZktN_eCLWijf0,132
+kaqing-2.0.54.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+kaqing-2.0.54.dist-info/entry_points.txt,sha256=SkzhuQJUWsXOzHeZ5TgQ2c3_g53UGK23zzJU_JTZOZI,39
+kaqing-2.0.54.dist-info/top_level.txt,sha256=8_2PZkwBb-xDcnc8a2rAbQeJhXKXskc7zTP7pSPa1fw,5
+kaqing-2.0.54.dist-info/RECORD,,