kaqing 2.0.55__py3-none-any.whl → 2.0.57__py3-none-any.whl

adam/sql/sql_completer.py

@@ -7,7 +7,131 @@ from sqlparse import tokens as T
 
 from adam.sql.term_completer import TermCompleter
 
+columns = TermCompleter(['id', 'x.', 'y.', 'z.'])
+
 class SqlCompleter(Completer):
+    # <select_statement> ::= SELECT <select_list>
+    #                      FROM <table_expression>
+    #                      [WHERE <search_condition>]
+    #                      [<group_by_clause>]
+    #                      [<having_clause>]
+    #                      [<order_by_clause>]
+    #                      [<limit_clause>]
+
+    # <search_condition> ::= <boolean_term>
+    #                      | <search_condition> OR <boolean_term>
+
+    # <boolean_term> ::= <boolean_factor>
+    #                  | <boolean_term> AND <boolean_factor>
+
+    # <boolean_factor> ::= [NOT] <predicate>
+    #                    | ([NOT] <search_condition>)
+
+    # <predicate> ::= <comparison_predicate>
+    #               | <between_predicate>
+    #               | <in_predicate>
+    #               | <like_predicate>
+    #               | <null_predicate>
+    #               | <exists_predicate>
+    #               | <quantified_predicate>
+    #               | <unique_predicate>
+    #               | <match_predicate>
+    #               | <overlaps_predicate>
+    #               | <distinct_predicate>
+    #               | <member_predicate>
+    #               | <submultiset_predicate>
+    #               | <set_predicate>
+
+    # <comparison_predicate> ::= <row_value_expression> <comparison_operator> <row_value_expression>
+    # <comparison_operator> ::= '=' | '<>' | '<' | '<=' | '>' | '>='
+
+    # <row_value_expression> ::= <value_expression>
+    #                          | (<value_expression> [ { <comma> <value_expression> }... ])
+
+    # <value_expression> ::= <numeric_value_expression>
+    #                      | <string_value_expression>
+    #                      | <datetime_value_expression>
+    #                      | <interval_value_expression>
+    #                      | <boolean_value_expression>
+    #                      | <user_defined_type_value_expression>
+    #                      | <reference_value_expression>
+    #                      | <collection_value_expression>
+    #                      | <row_value_constructor>
+    #                      | <case_expression>
+    #                      | <cast_expression>
+    #                      | <subquery>
+    #                      | NULL
+    #                      | DEFAULT
+    #                      | <identifier>
+    #                      | <literal>
+
+    # <insert_statement> ::= INSERT INTO <table_name> [ ( <column_list> ) ]
+    #                        VALUES ( <value_list> )
+    #                      | INSERT INTO <table_name> [ ( <column_list> ) ]
+    #                        <query_expression>
+
+    # <table_name> ::= <identifier>
+
+    # <column_list> ::= <column_name> [ , <column_list> ]
+
+    # <column_name> ::= <identifier>
+
+    # <value_list> ::= <expression> [ , <value_list> ]
+
+    # <query_expression> ::= SELECT <select_list> FROM <table_reference_list> [ WHERE <search_condition> ] [ GROUP BY <grouping_column_list> ] [ HAVING <search_condition> ] [ ORDER BY <sort_specification_list> ]
+
+    # <update_statement> ::= UPDATE <table_name>
+    #                        SET <set_clause_list>
+    #                        [WHERE <search_condition>]
+
+    # <set_clause_list> ::= <set_clause> { , <set_clause> }
+
+    # <set_clause> ::= <column_name> = <update_value>
+
+    # <update_value> ::= <expression> | NULL | DEFAULT
+
+    # <search_condition> ::= <boolean_expression>
+
+    # <delete_statement> ::= DELETE FROM <table_name> [ WHERE <search_condition> ]
+
+    # <table_name> ::= <identifier>
+
+    # <search_condition> ::= <boolean_expression>
+
+    # <boolean_expression> ::= <predicate>
+    #                      | <boolean_expression> AND <predicate>
+    #                      | <boolean_expression> OR <predicate>
+    #                      | NOT <predicate>
+    #                      | ( <boolean_expression> )
+
+    # <predicate> ::= <expression> <comparison_operator> <expression>
+    #              | <expression> IS NULL
+    #              | <expression> IS NOT NULL
+    #              | <expression> LIKE <pattern> [ ESCAPE <escape_character> ]
+    #              | <expression> IN ( <expression_list> )
+    #              | EXISTS ( <select_statement> )
+    #              | ... (other predicates)
+
+    # <comparison_operator> ::= = | <> | != | > | < | >= | <=
+
+    # <expression> ::= <literal>
+    #               | <column_name>
+    #               | <function_call>
+    #               | ( <expression> )
+    #               | <expression> <arithmetic_operator> <expression>
+    #               | ... (other expressions)
+
+    # <literal> ::= <numeric_literal> | <string_literal> | <boolean_literal> | <date_literal> | ...
+
+    # <column_name> ::= <identifier>
+
+    # <identifier> ::= <letter> { <letter> | <digit> | _ }...
+
+    # <pattern> ::= <string_literal>
+
+    # <escape_character> ::= <string_literal> (single character)
+
+    # <expression_list> ::= <expression> { , <expression> }...
     def __init__(self, tables: Callable[[], list[str]], dml: str = None, debug = False):
         super().__init__()
         self.dml = dml
@@ -42,59 +166,67 @@ class SqlCompleter(Completer):
                 completer = TermCompleter(['*'])
             elif state == 'select_a_':
                 completer = TermCompleter(['from'])
-            elif state == "select_a_from_":
+            elif state == "select_from_":
                 completer = TermCompleter(self.tables())
-            elif state == "select_a_from_x_":
+            elif state == "select_from_x_":
+                completer = TermCompleter(['as', 'where', 'inner', 'left', 'right', 'full', 'group', 'limit'])
+            elif state == "select_from_x_as_x_":
                 completer = TermCompleter(['where', 'inner', 'left', 'right', 'full', 'group', 'limit'])
-            elif state == "select_a_from_x,":
+            elif state == "select_from_x,":
+                completer = TermCompleter(self.tables())
+            elif state == "select_from_x_as_":
+                completer = TermCompleter(['x', 'y', 'z'])
+            elif state == "select_from_x_as_x,":
                 completer = TermCompleter(self.tables())
-            elif state == "select_a_from_x_where_":
-                completer = TermCompleter(['id'])
-            elif state == "select_a_from_x_where_id":
-                completer = TermCompleter(['=', '<', '<=', '>', '>=', '<>', 'like'])
-            elif state == "select_a_from_x_where_id=":
+            elif state == "select_where_":
+                completer = columns
+            elif state in ["select_where_a", "select_where_a_"]:
+                completer = TermCompleter(['=', '<', '<=', '>', '>=', '<>', 'like', 'not'])
+            elif state == "select_where_a_not_":
+                completer = TermCompleter(['like', 'in'])
+            elif state == "select_where_a_op":
                 completer = TermCompleter(["'"])
-            elif state == "select_a_from_x_where_id=v_":
+            elif state == "select_where_sc_":
                 completer = TermCompleter(['and', 'or', 'group', 'limit'])
-            elif state == "select_a_from_x_where_id=v_limit_":
+            elif state == "select_where_sc_limit_":
                 completer = TermCompleter(['1'])
-            elif state == "select_a_from_x_group_":
+            elif state == "select_from_x_group_":
                 completer = TermCompleter(['by'])
-            elif state == "select_a_from_x_group_by_":
-                completer = TermCompleter(['id'])
-            elif state == "select_a_from_x_group_by_a,":
-                completer = TermCompleter(['id'])
-            elif state == "select_a_from_x_group_by_a_":
+            elif state == "select_from_x_group_by_":
+                completer = columns
+            elif state == "select_from_x_group_by_a,":
+                completer = columns
+            elif state == "select_from_x_group_by_a_":
                 completer = TermCompleter(['limit'])
-            elif state == "select_a_from_x_group_by_a_limit_":
+            elif state == "select_from_x_group_by_a_limit_":
                 completer = TermCompleter(['1'])
-            elif state == "select_a_from_x_inner_":
+            elif state == "select_from_x_inner_":
                 completer = TermCompleter(['join'])
-            elif state in ["select_a_from_x_inner_join_", "select_a_from_x_left_join_"]:
+            elif state in ["select_join_", "select_from_x_left_join_"]:
                 completer = TermCompleter(self.tables())
-            elif state == "select_a_from_x_inner_join_y,":
+            elif state == "select_x_join_y,":
                 completer = TermCompleter(self.tables())
-            elif state == "select_a_from_x_inner_join_y_":
+            elif state == "select_x_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":
+            elif state == "select_x_join_y_on_":
+                completer = columns
+            elif state == "select_x_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_":
+            elif state == "select_x_join_y_on_a_op":
+                completer = columns
+            elif state == "select_x_join_y_on_a_opb_":
                 completer = TermCompleter(['where', 'group', 'limit'])
-            elif state == "select_a_from_x_left_":
+            elif state == "select_from_x_left_":
                 completer = TermCompleter(['outer', 'join'])
-            elif state == "select_a_from_x_left_outer_":
+            elif state == "select_from_x_left_outer_":
                 completer = TermCompleter(['join'])
-            elif state == "select_a_from_x_right_":
+            elif state == "select_from_x_right_":
                 completer = TermCompleter(['outer', 'join'])
-            elif state == "select_a_from_x_right_outer_":
+            elif state == "select_from_x_right_outer_":
                 completer = TermCompleter(['join'])
-            elif state == "select_a_from_x_full_":
+            elif state == "select_from_x_full_":
                 completer = TermCompleter(['outer'])
-            elif state == "select_a_from_x_full_outer_":
+            elif state == "select_from_x_full_outer_":
                 completer = TermCompleter(['join'])
 
             elif state == "insert_":
@@ -102,35 +234,35 @@ class SqlCompleter(Completer):
             elif state == "insert_into_":
                 completer = TermCompleter(self.tables())
             elif state == "insert_into_x_":
-                completer = TermCompleter(['values'])
-            elif state == "insert_into_x(":
-                completer = TermCompleter(['id'])
-            elif state == "insert_into_x(a,":
-                completer = TermCompleter(['id'])
-            elif state == "insert_into_x(a)_":
-                completer = TermCompleter(['values('])
-            elif state == "insert_into_x_values":
+                completer = TermCompleter(['values(', 'select'])
+            elif state == "insert_into_x_lp_":
+                completer = columns
+            elif state == "insert_into_x_lp_a,":
+                completer = columns
+            elif state == "insert_into_x_lp_a_rp_":
+                completer = TermCompleter(['values(', 'select'])
+            elif state == "insert_values":
                 completer = TermCompleter(['('])
-            elif state == "insert_into_x_values(":
+            elif state == "insert_values_lp_":
                 completer = TermCompleter(["'"])
 
             elif state == "update_":
                 completer = TermCompleter(self.tables())
             elif state == "update_x_":
                 completer = TermCompleter(['set'])
-            elif state in ["update_x_set_", "update_x_set_a=v,"]:
-                completer = TermCompleter(['id'])
+            elif state in ["update_x_set_", "update_x_set_sc,"]:
+                completer = columns
             elif state == "update_x_set_a":
                 completer = TermCompleter(['='])
-            elif state == "update_x_set_a=":
+            elif state == "update_x_set_a_op":
                 completer = TermCompleter(["'"])
-            elif state == "update_x_set_a=v_":
+            elif state == "update_x_set_sc_":
                 completer = TermCompleter(['where'])
-            elif state == "update_x_set_a=v_where_":
-                completer = TermCompleter(['id'])
-            elif state == "update_x_set_a=v_where_id":
+            elif state == "update_where_":
+                completer = columns
+            elif state == "update_where_a":
                 completer = TermCompleter(['='])
-            elif state == "update_x_set_a=v_where_id=v_":
+            elif state == "update_where_sc_":
                 completer = TermCompleter(['and', 'or'])
 
             elif state == "delete_":
@@ -139,13 +271,13 @@ class SqlCompleter(Completer):
                 completer = TermCompleter(self.tables())
             elif state == "delete_from_x_":
                 completer = TermCompleter(['where'])
-            elif state == "delete_from_x_where_":
-                completer = TermCompleter(['id'])
-            elif state == "delete_from_x_where_id":
+            elif state == "delete_where_":
+                completer = columns
+            elif state == "delete_where_a":
                 completer = TermCompleter(['='])
-            elif state == "delete_from_x_where_id=":
+            elif state == "delete_where_a_op":
                 completer = TermCompleter(["'"])
-            elif state == "delete_from_x_where_id=v_":
+            elif state == "delete_where_sc_":
                 completer = TermCompleter(['and', 'or'])
 
         if completer:
@@ -200,191 +332,225 @@ class SqlCompleter(Completer):
                         state = 'select_a'
                 elif state == 'select_a_':
                     if token.ttype == T.Keyword and token.value.lower() == 'from':
-                        state = 'select_a_from'
-                elif state == 'select_a_from':
+                        state = 'select_from'
+                elif state == 'select_from':
                     if token.ttype == T.Text.Whitespace:
-                        state = 'select_a_from_'
-                elif state == 'select_a_from_':
+                        state = 'select_from_'
+                elif state == 'select_from_':
                     if token.ttype == T.Name:
-                        state = 'select_a_from_x'
-                elif state == 'select_a_from_x':
+                        state = 'select_from_x'
+                elif state == 'select_from_x':
                     if token.ttype == T.Text.Whitespace:
-                        state = 'select_a_from_x_'
+                        state = 'select_from_x_'
                     elif token.ttype == T.Punctuation and token.value == ',':
-                        state = 'select_a_from_x,'
-                elif state == 'select_a_from_x,':
+                        state = 'select_from_x,'
+                elif state == 'select_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':
-                        state = 'select_a_from_x_where'
+                        state = 'select_from_x'
+                elif state in ['select_from_x_', 'select_from_x_as_x_']:
+                    if token.ttype == T.Punctuation and token.value == ',':
+                        state = 'select_from_x,'
+                    elif token.ttype == T.Keyword and token.value.lower() == 'as':
+                        state = 'select_from_x_as'
+                    elif token.ttype == T.Keyword and token.value.lower() == 'where':
+                        state = 'select_where'
                     elif token.ttype == T.Keyword and token.value.lower() == 'limit':
-                        state = 'select_a_from_x_where_id=v_limit'
+                        state = 'select_where_sc_limit'
                     elif token.ttype == T.Keyword and token.value.lower() == 'group':
-                        state = 'select_a_from_x_group'
+                        state = 'select_from_x_group'
                     elif token.ttype == T.Keyword and token.value.lower() == 'group by':
-                        state = 'select_a_from_x_group_by'
+                        state = 'select_from_x_group_by'
                     elif token.ttype == T.Keyword and token.value.lower() == 'inner':
-                        state = 'select_a_from_x_inner'
+                        state = 'select_from_x_inner'
                     elif token.ttype == T.Keyword and token.value.lower() == 'inner join':
-                        state = 'select_a_from_x_inner_join'
+                        state = 'select_join'
                     elif token.ttype == T.Keyword and token.value.lower() == 'left':
-                        state = 'select_a_from_x_left'
+                        state = 'select_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'
+                        state = 'select_join'
                     elif token.ttype == T.Keyword and token.value.lower() == 'right':
-                        state = 'select_a_from_x_right'
+                        state = 'select_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'
+                        state = 'select_join'
                     elif token.ttype == T.Keyword and token.value.lower() == 'full':
-                        state = 'select_a_from_x_full'
+                        state = 'select_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':
+                        state = 'select_join'
+                elif state == 'select_from_x_as':
                     if token.ttype == T.Text.Whitespace:
-                        state = 'select_a_from_x_where_'
-                elif state == 'select_a_from_x_where_':
+                        state = 'select_from_x_as_'
+                elif state == 'select_from_x_as_':
                     if token.ttype == T.Name:
-                        state = 'select_a_from_x_where_id'
-                elif state == 'select_a_from_x_where_id':
+                        state = 'select_from_x_as_x'
+                elif state == 'select_from_x_as_x':
+                    if token.ttype == T.Text.Whitespace:
+                        state = 'select_from_x_as_x_'
+                    elif token.ttype == T.Punctuation and token.value == ',':
+                        state = 'select_from_x_as_x,'
+                elif state == 'select_from_x_as_x,':
+                    if token.ttype == T.Name:
+                        state = 'select_from_x'
+                elif state == 'select_where':
+                    if token.ttype == T.Text.Whitespace:
+                        state = 'select_where_'
+                elif state == 'select_where_':
+                    if token.ttype == T.Name:
+                        state = 'select_where_a'
+                elif state == 'select_where_a':
+                    if token.ttype == T.Text.Whitespace:
+                        state = 'select_where_a_'
+                    elif token.ttype == T.Operator.Comparison:
+                        state = 'select_where_a_op'
+                elif state == 'select_where_a_':
                     if token.ttype == T.Operator.Comparison:
-                        state = 'select_a_from_x_where_id='
-                elif state == 'select_a_from_x_where_id=':
+                        state = 'select_where_a_op'
+                    elif token.ttype == T.Keyword and token.value.lower() == 'not':
+                        state = 'select_where_a_not'
+                elif state == 'select_where_a_not':
+                    if token.ttype == T.Text.Whitespace:
+                        state = 'select_where_a_not_'
+                elif state == 'select_where_a_not_':
+                    if token.ttype == T.Operator.Comparison:
+                        state = 'select_where_a_not_op'
+                elif state == 'select_where_a_not_op':
+                    if token.ttype in [T.Literal.String.Single, T.Name]:
+                        state = 'select_where_sc'
+                elif state == 'select_where_a_op':
                     if token.ttype in [T.Literal.String.Single, T.Name]:
-                        state = 'select_a_from_x_where_id=v'
-                elif state == 'select_a_from_x_where_id=v':
+                        state = 'select_where_sc'
+                elif state == 'select_where_sc':
                     if token.ttype == T.Text.Whitespace:
-                        state = 'select_a_from_x_where_id=v_'
-                elif state == 'select_a_from_x_where_id=v_':
+                        state = 'select_where_sc_'
+                elif state == 'select_where_sc_':
                     if token.ttype == T.Keyword and token.value.lower() in ['and', 'or']:
-                        state = 'select_a_from_x_where'
+                        state = 'select_where'
                     elif token.ttype == T.Keyword and token.value.lower() == 'group':
-                        state = 'select_a_from_x_group'
+                        state = 'select_from_x_group'
                     elif token.ttype == T.Keyword and token.value.lower() == 'group by':
-                        state = 'select_a_from_x_group_by'
+                        state = 'select_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':
+                        state = 'select_where_sc_limit'
+                elif state == 'select_from_x_group':
                     if token.ttype == T.Text.Whitespace:
-                        state = 'select_a_from_x_group_'
-                elif state == 'select_a_from_x_group_':
+                        state = 'select_from_x_group_'
+                elif state == 'select_from_x_group_':
                     if token.ttype == T.Keyword and token.value.lower() == 'by':
-                        state = 'select_a_from_x_group_by'
-                elif state == 'select_a_from_x_group_by':
+                        state = 'select_from_x_group_by'
+                elif state == 'select_from_x_group_by':
                     if token.ttype == T.Text.Whitespace:
-                        state = 'select_a_from_x_group_by_'
-                elif state == 'select_a_from_x_group_by_':
+                        state = 'select_from_x_group_by_'
+                elif state == 'select_from_x_group_by_':
                     if token.ttype == T.Name:
-                        state = 'select_a_from_x_group_by_a'
-                elif state == 'select_a_from_x_group_by_a':
+                        state = 'select_from_x_group_by_a'
+                elif state == 'select_from_x_group_by_a':
                     if token.ttype == T.Text.Whitespace:
-                        state = 'select_a_from_x_group_by_a_'
+                        state = 'select_from_x_group_by_a_'
                     elif token.ttype == T.Punctuation and token.value == ',':
-                        state = 'select_a_from_x_group_by_a,'
-                elif state == 'select_a_from_x_group_by_a,':
+                        state = 'select_from_x_group_by_a,'
+                elif state == 'select_from_x_group_by_a,':
                     if token.ttype == T.Name:
-                        state = 'select_a_from_x_group_by_a'
-                elif state == 'select_a_from_x_group_by_a_':
+                        state = 'select_from_x_group_by_a'
+                elif state == 'select_from_x_group_by_a_':
                     if token.ttype == T.Keyword and token.value.lower() == 'limit':
-                        state = 'select_a_from_x_where_id=v_limit'
-                elif state == 'select_a_from_x_where_id=v_limit':
+                        state = 'select_where_sc_limit'
+                elif state == 'select_where_sc_limit':
                     if token.ttype == T.Text.Whitespace:
-                        state = 'select_a_from_x_where_id=v_limit_'
-                elif state == 'select_a_from_x_inner':
+                        state = 'select_where_sc_limit_'
+                elif state == 'select_from_x_inner':
                     if token.ttype == T.Text.Whitespace:
-                        state = 'select_a_from_x_inner_'
-                elif state == 'select_a_from_x_inner_':
+                        state = 'select_from_x_inner_'
+                elif state == 'select_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':
+                        state = 'select_join'
+                elif state == 'select_join':
                     if token.ttype == T.Text.Whitespace:
-                        state = 'select_a_from_x_inner_join_'
-                elif state == 'select_a_from_x_inner_join_':
+                        state = 'select_join_'
+                elif state == 'select_join_':
                     if token.ttype == T.Name:
-                        state = 'select_a_from_x_inner_join_y'
+                        state = 'select_x_join_y'
 
-                elif state == 'select_a_from_x_left':
+                elif state == 'select_from_x_left':
                     if token.ttype == T.Text.Whitespace:
-                        state = 'select_a_from_x_left_'
-                elif state == 'select_a_from_x_left_':
+                        state = 'select_from_x_left_'
+                elif state == 'select_from_x_left_':
                     if token.ttype == T.Keyword and token.value.lower() == 'join':
-                        state = 'select_a_from_x_inner_join'
+                        state = 'select_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':
+                        state = 'select_from_x_left_outer'
+                elif state == 'select_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_':
+                        state = 'select_from_x_left_outer_'
+                elif state == 'select_from_x_left_outer_':
                     if token.ttype == T.Keyword and token.value.lower() == 'join':
-                        state = 'select_a_from_x_inner_join_'
+                        state = 'select_join_'
 
-                elif state == 'select_a_from_x_right':
+                elif state == 'select_from_x_right':
                     if token.ttype == T.Text.Whitespace:
-                        state = 'select_a_from_x_right_'
-                elif state == 'select_a_from_x_right_':
+                        state = 'select_from_x_right_'
+                elif state == 'select_from_x_right_':
                     if token.ttype == T.Keyword and token.value.lower() == 'join':
-                        state = 'select_a_from_x_inner_join'
+                        state = 'select_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':
+                        state = 'select_from_x_right_outer'
+                elif state == 'select_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_':
+                        state = 'select_from_x_right_outer_'
+                elif state == 'select_from_x_right_outer_':
                     if token.ttype == T.Keyword and token.value.lower() == 'join':
-                        state = 'select_a_from_x_inner_join_'
+                        state = 'select_join_'
 
-                elif state == 'select_a_from_x_full':
+                elif state == 'select_from_x_full':
                     if token.ttype == T.Text.Whitespace:
-                        state = 'select_a_from_x_full_'
-                elif state == 'select_a_from_x_full_':
+                        state = 'select_from_x_full_'
+                elif state == 'select_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':
+                        state = 'select_from_x_full_outer'
+                elif state == 'select_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_':
+                        state = 'select_from_x_full_outer_'
+                elif state == 'select_from_x_full_outer_':
                     if token.ttype == T.Keyword and token.value.lower() == 'join':
-                        state = 'select_a_from_x_inner_join_'
+                        state = 'select_join_'
 
-                elif state == 'select_a_from_x_inner_join_y':
+                elif state == 'select_x_join_y':
                     if token.ttype == T.Punctuation and token.value == ',':
-                        state = 'select_a_from_x_inner_join_y,'
+                        state = 'select_x_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,':
+                        state = 'select_x_join_y_'
+                elif state == 'select_x_join_y,':
                     if token.ttype == T.Name:
-                        state = 'select_a_from_x_inner_join_y'
-                elif state == 'select_a_from_x_inner_join_y_':
+                        state = 'select_x_join_y'
+                elif state == 'select_x_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':
+                        state = 'select_x_join_y_on'
+                elif state == 'select_x_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_':
+                        state = 'select_x_join_y_on_'
+                elif state == 'select_x_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':
+                        state = 'select_x_join_y_on_a'
+                elif state == 'select_x_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=':
+                        state = 'select_x_join_y_on_a_op'
+                elif state == 'select_x_join_y_on_a_op':
                     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':
+                        state = 'select_x_join_y_on_a_opb'
+                elif state == 'select_x_join_y_on_a_opb':
                     if token.ttype == T.Text.Whitespace:
-                        state = 'select_a_from_x_inner_join_y_on_a=b_'
+                        state = 'select_x_join_y_on_a_opb_'
                     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_':
+                        state = 'select_x_join_y_on_'
+                elif state == 'select_x_join_y_on_a_opb_':
                     if token.ttype == T.Keyword and token.value.lower() in ['and', 'or']:
-                        state = 'select_a_from_x_inner_join'
+                        state = 'select_join'
                     elif token.ttype == T.Keyword and token.value.lower() == 'where':
-                        state = 'select_a_from_x_where'
+                        state = 'select_where'
                     elif token.ttype == T.Keyword and token.value.lower() == 'group':
-                        state = 'select_a_from_x_group'
+                        state = 'select_from_x_group'
                     elif token.ttype == T.Keyword and token.value.lower() == 'group by':
-                        state = 'select_a_from_x_group_by'
+                        state = 'select_from_x_group_by'
                     elif token.ttype == T.Keyword and token.value.lower() == 'limit':
-                        state = 'select_a_from_x_where_id=v_limit'
+                        state = 'select_where_sc_limit'
 
                 elif state == 'insert':
                     if token.ttype == T.Text.Whitespace:
@@ -402,43 +568,43 @@ class SqlCompleter(Completer):
                     if token.ttype == T.Text.Whitespace:
                         state = 'insert_into_x_'
                     elif token.ttype == T.Punctuation and token.value == '(':
-                        state = 'insert_into_x('
+                        state = 'insert_into_x_lp_'
                 elif state == 'insert_into_x_':
                     if token.ttype == T.Punctuation and token.value == '(':
-                        state = 'insert_into_x('
+                        state = 'insert_into_x_lp_'
                     elif token.ttype == T.Keyword and token.value.lower() == 'values':
-                        state = 'insert_into_x_values'
-                elif state == 'insert_into_x(':
+                        state = 'insert_values'
+                elif state == 'insert_into_x_lp_':
                     if token.ttype == T.Name:
-                        state = 'insert_into_x(a'
-                elif state == 'insert_into_x(a':
+                        state = 'insert_into_x_lp_a'
+                elif state == 'insert_into_x_lp_a':
                     if token.ttype == T.Punctuation and token.value == ',':
-                        state = 'insert_into_x(a,'
+                        state = 'insert_into_x_lp_a,'
                     elif token.ttype == T.Punctuation and token.value == ')':
-                        state = 'insert_into_x(a)'
-                elif state == 'insert_into_x(a,':
+                        state = 'insert_into_x_lp_a_rp'
+                elif state == 'insert_into_x_lp_a,':
                     if token.ttype == T.Name:
-                        state = 'insert_into_x(a'
-                elif state == 'insert_into_x(a)':
+                        state = 'insert_into_x_lp_a'
+                elif state == 'insert_into_x_lp_a_rp':
                     if token.ttype == T.Text.Whitespace:
-                        state = 'insert_into_x(a)_'
-                elif state == 'insert_into_x(a)_':
+                        state = 'insert_into_x_lp_a_rp_'
+                elif state == 'insert_into_x_lp_a_rp_':
                     if token.ttype == T.Keyword and token.value.lower() == 'values':
-                        state = 'insert_into_x_values'
-                elif state == 'insert_into_x_values':
+                        state = 'insert_values'
+                    elif token.ttype == T.Keyword.DML and token.value.lower() == 'select':
+                        state = 'select_'
+                elif state == 'insert_values':
                     if token.ttype == T.Punctuation and token.value == '(':
-                        state = 'insert_into_x_values('
-                elif state == 'insert_into_x_values(':
+                        state = 'insert_values_lp_'
+                elif state == 'insert_values_lp_':
                     if token.ttype in [T.Literal.String.Single, T.Name]:
-                        state = 'insert_into_x_values(v'
-                elif state == 'insert_into_x_values(v':
+                        state = 'insert_values_lp_v'
+                elif state == 'insert_values_lp_v':
                     if token.ttype == T.Punctuation and token.value == ',':
-                        state = 'insert_into_x_values(v,'
-                    elif token.ttype == T.Punctuation and token.value == ')':
-                        state = 'insert_into_x_values(v)'
-                elif state == 'insert_into_x_values(v,':
+                        state = 'insert_values_lp_v,'
+                elif state == 'insert_values_lp_v,':
                     if token.ttype in [T.Literal.String.Single, T.Name]:
-                        state = 'insert_into_x_values(v'
+                        state = 'insert_values_lp_v'
 
                 elif state == 'update':
                     if token.ttype == T.Text.Whitespace:
@@ -460,41 +626,41 @@ class SqlCompleter(Completer):
                         state = 'update_x_set_a'
                 elif state == 'update_x_set_a':
                     if token.ttype == T.Operator.Comparison:
-                        state = 'update_x_set_a='
-                elif state == 'update_x_set_a=':
+                        state = 'update_x_set_a_op'
+                elif state == 'update_x_set_a_op':
                     if token.ttype in [T.Literal.String.Single, T.Name]:
-                        state = 'update_x_set_a=v'
-                elif state == 'update_x_set_a=v':
+                        state = 'update_x_set_sc'
+                elif state == 'update_x_set_sc':
                     if token.ttype == T.Punctuation and token.value == ',':
-                        state = 'update_x_set_a=v,'
+                        state = 'update_x_set_sc,'
                     elif token.ttype == T.Text.Whitespace:
-                        state = 'update_x_set_a=v_'
-                elif state == 'update_x_set_a=v,':
+                        state = 'update_x_set_sc_'
+                elif state == 'update_x_set_sc,':
                     if token.ttype == T.Name:
                         state = 'update_x_set_a'
-                elif state == 'update_x_set_a=v_':
+                elif state == 'update_x_set_sc_':
                     if token.ttype == T.Punctuation and token.value == ',':
-                        state = 'update_x_set_a=v,'
+                        state = 'update_x_set_sc,'
                     elif token.ttype == T.Keyword and token.value.lower() == 'where':
-                        state = 'update_x_set_a=v_where'
-                elif state == 'update_x_set_a=v_where':
+                        state = 'update_where'
+                elif state == 'update_where':
                     if token.ttype == T.Text.Whitespace:
-                        state = 'update_x_set_a=v_where_'
-                elif state == 'update_x_set_a=v_where_':
+                        state = 'update_where_'
+                elif state == 'update_where_':
                     if token.ttype == T.Name:
-                        state = 'update_x_set_a=v_where_id'
-                elif state == 'update_x_set_a=v_where_id':
+                        state = 'update_where_a'
+                elif state == 'update_where_a':
                     if token.ttype == T.Operator.Comparison:
-                        state = 'update_x_set_a=v_where_id='
-                elif state == 'update_x_set_a=v_where_id=':
+                        state = 'update_where_a_op'
+                elif state == 'update_where_a_op':
                     if token.ttype in [T.Literal.String.Single, T.Name]:
-                        state = 'update_x_set_a=v_where_id=v'
-                elif state == 'update_x_set_a=v_where_id=v':
+                        state = 'update_where_sc'
+                elif state == 'update_where_sc':
                     if token.ttype == T.Text.Whitespace:
-                        state = 'update_x_set_a=v_where_id=v_'
-                elif state == 'update_x_set_a=v_where_id=v_':
+                        state = 'update_where_sc_'
+                elif state == 'update_where_sc_':
                     if token.ttype == T.Keyword and token.value.lower() in ['and', 'or']:
-                        state = 'update_x_set_a=v_where'
+                        state = 'update_where'
 
                 elif state == 'delete':
                     if token.ttype == T.Text.Whitespace:
@@ -513,25 +679,25 @@ class SqlCompleter(Completer):
                         state = 'delete_from_x_'
                 elif state == 'delete_from_x_':
                     if token.ttype == T.Keyword and token.value.lower() == 'where':
-                        state = 'delete_from_x_where'
-                elif state == 'delete_from_x_where':
+                        state = 'delete_where'
+                elif state == 'delete_where':
                     if token.ttype == T.Text.Whitespace:
-                        state = 'delete_from_x_where_'
-                elif state == 'delete_from_x_where_':
+                        state = 'delete_where_'
+                elif state == 'delete_where_':
                     if token.ttype == T.Name:
-                        state = 'delete_from_x_where_id'
-                elif state == 'delete_from_x_where_id':
+                        state = 'delete_where_a'
+                elif state == 'delete_where_a':
                     if token.ttype == T.Operator.Comparison:
-                        state = 'delete_from_x_where_id='
-                elif state == 'delete_from_x_where_id=':
+                        state = 'delete_where_a_op'
+                elif state == 'delete_where_a_op':
                     if token.ttype in [T.Literal.String.Single, T.Name]:
-                        state = 'delete_from_x_where_id=v'
-                elif state == 'delete_from_x_where_id=v':
+                        state = 'delete_where_sc'
+                elif state == 'delete_where_sc':
                     if token.ttype == T.Text.Whitespace:
-                        state = 'delete_from_x_where_id=v_'
-                elif state == 'delete_from_x_where_id=v_':
+                        state = 'delete_where_sc_'
+                elif state == 'delete_where_sc_':
                     if token.ttype == T.Keyword and token.value.lower() in ['and', 'or']:
-                        state = 'delete_from_x_where'
+                        state = 'delete_where'
 
         return state
 

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, "")

adam/version.py

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

{kaqing-2.0.55.dist-info → kaqing-2.0.57.dist-info}/METADATA

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

{kaqing-2.0.55.dist-info → kaqing-2.0.57.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=1igvrn67AjTOcviySrpDWebyfe7wHN1EWQt56kFGM58,139
+adam/version.py,sha256=kXINOe-uvId2Kbv9pAAleFVyJC-tHoAx6EmOAUzCUjY,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,9 +164,8 @@ 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=rl7UlL5kthXOmcPBK3LFD1H0S2yDZMIQPbov1x8Wo9w,29819
-adam/sql/sql_utils.py,sha256=MLoxB9h22WZiANu0SZzmBJcY2gtb6f_D4jnoJEjLgPc,171
-adam/sql/term_completer.py,sha256=O-sUxFVc1DJmPQCdT-XPK2SSkUe4AL1dw8ZPXXicATY,2273
+adam/sql/sql_completer.py,sha256=BAg1Ogn_q1JSjpQhN-2jVzIuMoH1FpFzn_xpMRvB-TQ,35882
+adam/sql/term_completer.py,sha256=VCCMPUzvh_9lwIOwqQmeijM0V2JPADkBbNV4HQIqDCw,2538
 adam/sso/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 adam/sso/authenticator.py,sha256=BCm16L9zf5aLU47-sTCnudn2zLPwd8M2wwRminJfsqw,615
 adam/sso/authn_ad.py,sha256=fDW8UR3WWykny5Awa5dQjjBUSFzIDz4aMn-lwXoABl8,5857
@@ -177,8 +176,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.55.dist-info/METADATA,sha256=3kKBRQ9yQ_KbdoGuD42fhkxDprEvWUEsRe5UO67FhvA,132
-kaqing-2.0.55.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-kaqing-2.0.55.dist-info/entry_points.txt,sha256=SkzhuQJUWsXOzHeZ5TgQ2c3_g53UGK23zzJU_JTZOZI,39
-kaqing-2.0.55.dist-info/top_level.txt,sha256=8_2PZkwBb-xDcnc8a2rAbQeJhXKXskc7zTP7pSPa1fw,5
-kaqing-2.0.55.dist-info/RECORD,,
+kaqing-2.0.57.dist-info/METADATA,sha256=AJUgGbSTZ4aZy5vdBdNW076Iv-L5SKzR00IFzWOtDUk,132
+kaqing-2.0.57.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+kaqing-2.0.57.dist-info/entry_points.txt,sha256=SkzhuQJUWsXOzHeZ5TgQ2c3_g53UGK23zzJU_JTZOZI,39
+kaqing-2.0.57.dist-info/top_level.txt,sha256=8_2PZkwBb-xDcnc8a2rAbQeJhXKXskc7zTP7pSPa1fw,5
+kaqing-2.0.57.dist-info/RECORD,,

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(' ')