kaqing 2.0.60__tar.gz → 2.0.61__tar.gz

{kaqing-2.0.60 → kaqing-2.0.61}/PKG-INFO

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

{kaqing-2.0.60 → kaqing-2.0.61}/adam/sql/sql_completer.py

@@ -333,12 +333,12 @@ class SqlCompleter(Completer):
             'select_where_a_not_             > comparison       > select_where_a_not_op',
             '-                               > in               > select_where_a_in',
             'select_where_a_in               > (                > select_where_a_in_lp_',
-            'select_where_a_in_lp_           > name|single      > select_where_a_in_lp_a',
+            'select_where_a_in_lp_           > name|single|num  > select_where_a_in_lp_a',
             'select_where_a_in_lp_a          > ,                > select_where_a_in_lp_a_comma_',
             '-                               > )                > select_where_sc',
-            'select_where_a_in_lp_a_comma_   > name|single      > select_where_a_in_lp_a',
-            'select_where_a_not_op           > name|single      > select_where_sc',
-            'select_where_a_op               > name|single      > select_where_sc',
+            'select_where_a_in_lp_a_comma_   > name|single|num  > select_where_a_in_lp_a',
+            'select_where_a_not_op           > name|single|num  > select_where_sc',
+            'select_where_a_op               > name|single|num  > select_where_sc',
             'select_where_sc_                > and|or           > select_where',
             '-                               > group            > select_group',
             '-                               > group by         > select_group_by',
@@ -366,7 +366,7 @@ class SqlCompleter(Completer):
             'select_x_join_y_                > on               > select_x_join_y_on',
             'select_x_join_y_on_             > name             > select_x_join_y_on_a',
             'select_x_join_y_on_a            > comparison       > select_x_join_y_on_a_op',
-            'select_x_join_y_on_a_op         > name|single      > select_x_join_y_on_a_op_b',
+            'select_x_join_y_on_a_op         > name             > select_x_join_y_on_a_op_b',
             'select_x_join_y_on_a_op_b       > ,                > select_x_join_y_on_',
             'select_x_join_y_on_a_op_b_      > and|or           > select_join',
             '-                               > where            > select_where',
@@ -388,9 +388,9 @@ class SqlCompleter(Completer):
             'insert_into_x_lp_a_rp__         > values           > insert_values',
             '-                               > select           > select',
             'insert_values                   > (                > insert_values_lp_',
-            'insert_values_lp_               > name|single      > insert_values_lp_v',
+            'insert_values_lp_               > name|single|num  > insert_values_lp_v',
             'insert_values_lp_v              > ,                > insert_values_lp_v_comma_',
-            'insert_values_lp_v_comma_       > name|single      > insert_values_lp_v',
+            'insert_values_lp_v_comma_       > name|single|num  > insert_values_lp_v',
 
 
             '                                > update           > update',
@@ -398,14 +398,14 @@ class SqlCompleter(Completer):
             'update_x_                       > set              > update_set',
             'update_set_                     > name             > update_set_a',
             'update_set_a                    > comparison       > update_set_a_op',
-            'update_set_a_op                 > name|single      > update_set_sc',
+            'update_set_a_op                 > name|single|num  > update_set_sc',
             'update_set_sc                   > ,                > update_set_sc_comma_',
             'update_set_sc_comma_            > name             > update_set_a',
             'update_set_sc_                  > ,                > update_set_sc_comma_',
             '-                               > where            > update_where',
             'update_where_                   > name             > update_where_a',
             'update_where_a                  > comparison       > update_where_a_op',
-            'update_where_a_op               > name|single      > update_where_sc',
+            'update_where_a_op               > name|single|num  > update_where_sc',
             'update_where_sc_                > and|or           > update_where',
 
 
@@ -415,7 +415,7 @@ class SqlCompleter(Completer):
             'delete_from_x_                  > where            > delete_where',
             'delete_where_                   > name             > delete_where_a',
             'delete_where_a                  > comparison       > delete_where_a_op',
-            'delete_where_a_op               > name|single      > delete_where_sc',
+            'delete_where_a_op               > name|single|num  > delete_where_sc',
             'delete_where_sc_                > and|or           > delete_where',
         ]
 
@@ -503,7 +503,7 @@ class SqlCompleter(Completer):
                         print(f'"{token.value}:{typ}" ', end='')
                     else:
                         print(f'{token.value}:{typ} ', end='')
-                # print("  " * indent + f"Token: {token.value}, Type: {token.ttype}@{token.ttype.__class__}")
+            # 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)
@@ -513,8 +513,12 @@ class SqlCompleter(Completer):
                     it = t
                 elif token.ttype == T.Text.Whitespace:
                     it = '_'
-                elif token.ttype in [T.Name, T.Literal.String.Single]:
+                elif token.ttype == T.Name:
                     it = 'name'
+                elif token.ttype == T.Literal.String.Single:
+                    it = 'single'
+                elif token.ttype in [T.Literal.Number.Integer, T.Literal.Number.Float]:
+                    it = 'num'
                 elif token.ttype == T.Wildcard:
                     it = '*'
                 elif token.ttype == T.Punctuation:

kaqing-2.0.61/adam/version.py

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

{kaqing-2.0.60 → kaqing-2.0.61}/kaqing.egg-info/PKG-INFO

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

{kaqing-2.0.60 → kaqing-2.0.61}/setup.py

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

kaqing-2.0.60/adam/version.py

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