kaqing 2.0.62__tar.gz → 2.0.63__tar.gz

{kaqing-2.0.62 → kaqing-2.0.63}/PKG-INFO

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

{kaqing-2.0.62 → kaqing-2.0.63}/adam/sql/sql_completer.py

@@ -215,7 +215,7 @@ class SqlCompleter(Completer):
             '-                               > full outer join  > select_join',
             'select_from_x_as_               > name             > select_from_x_as_x            ^ x,y,z',
             'select_from_x_as_x              > ,                > select_from_x_as_x_comma_',
-            'select_from_x_as_x_comma_       > name             > select_from_x_as_x            ^ tables',
+            'select_from_x_as_x_comma_       > name             > select_from_x                 ^ tables',
             'select_where_                   > name             > select_where_a                ^ id,x.,y.,z.',
             'select_where_a                  > comparison       > select_where_a_op             ^ =,<,<=,>,>=,<>,like,not,in',
             'select_where_a_                 > comparison       > select_where_a_op             ^ =,<,<=,>,>=,<>,like,not,in',
@@ -251,7 +251,10 @@ class SqlCompleter(Completer):
             'select_from_x_full_             > join             > select_join                   ^ outer join',
             '-                               > outer            > select_from_x_full_outer',
             'select_from_x_full_outer_       > join             > select_join                   ^ join',
-            'select_x_join_y_                > on               > select_x_join_y_on            ^ on',
+            'select_x_join_y_                > as               > select_x_join_y_as            ^ as,on',
+            '-                               > on               > select_x_join_y_on            ^ as,on',
+            'select_x_join_y_as_             > name             > select_x_join_y_as_y          ^ x,y,z',
+            'select_x_join_y_as_y_           > on               > select_x_join_y_on            ^ on',
             'select_x_join_y_on_             > name             > select_x_join_y_on_a          ^ id,x.,y.,z.',
             'select_x_join_y_on_a            > comparison       > select_x_join_y_on_a_op       ^ =',
             'select_x_join_y_on_a_op         > name             > select_x_join_y_on_a_op_b     ^ id,x.,y.,z.',
@@ -303,7 +306,7 @@ class SqlCompleter(Completer):
             'delete_where_sc_                > and|or           > delete_where                  ^ and,or',
         ]
 
-        def add_space_transition(from_s: str):
+        def add_whitespace_transition(from_s: str):
             # add whitespace transition if a state with trailing whitespace is found from from states, for example, select > _ > select_
             if from_s.endswith('_') and not from_s.endswith('_comma_') and not from_s.endswith('_lp_') and not from_s.endswith('_rp_'):
                 if self.debug:
@@ -346,7 +349,7 @@ class SqlCompleter(Completer):
 
                 if len(tks) == 1:
                     from_s = tks[0].strip(' ')
-                    add_space_transition(from_s)
+                    add_whitespace_transition(from_s)
                     from_ss_to_add.append(f'{from_s}')
                     continue
 
@@ -355,7 +358,7 @@ class SqlCompleter(Completer):
                 from_ss_to_add = []
                 from_ss.append(tks[0].strip(' '))
                 for from_s in from_ss:
-                    add_space_transition(from_s)
+                    add_whitespace_transition(from_s)
                     token = tks[1].strip(' ')
                     tokens = [token]
                     if len(tks) > 2:

kaqing-2.0.63/adam/version.py

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

{kaqing-2.0.62 → kaqing-2.0.63}/kaqing.egg-info/PKG-INFO

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

{kaqing-2.0.62 → kaqing-2.0.63}/setup.py

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

kaqing-2.0.62/adam/version.py

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