kaqing 2.0.87__tar.gz → 2.0.89__tar.gz

{kaqing-2.0.87 → kaqing-2.0.89}/PKG-INFO

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

{kaqing-2.0.87 → kaqing-2.0.89}/adam/sql/state_machine.py

@@ -138,7 +138,7 @@ SPEC = [
     '-                               > (                > select_from_lp_',
     '-                               < )                > select_from_sq',
     'select_from_lp_                 > select           > select',
-    'select_from_x                   > ,                > select_from_x_comma_',
+    'select_from_x                   > ,                > select_from_x_comma_                    ^ (select,tables',
     'select_from_sq_                 > as               > select_from_x_as                        ^ as',
     'select_from_x_comma_            > name             > select_from_x                           ^ tables',
     'select_from_x_                                                                               ^ as,where,inner join,left outer join,right outer join,full outer join,group by,order by,limit',
@@ -164,7 +164,8 @@ SPEC = [
     'select_from_x_as_x              > ,                > select_from_x_as_x_comma_',
     'select_from_x_as_x_comma_       > name             > select_from_x                           ^ tables',
     'select_where_                   > name             > select_where_a                          ^ columns',
-    'select_where_a                  > comparison       > select_where_a_op                       ^ =,<,<=,>,>=,<>,like,not,in',
+    'select_where_a                  > name             > select_where_a                          ^ columns,=,<,<=,>,>=,<>',
+    '-                               > comparison       > select_where_a_op',
     'select_where_a_                 > comparison       > select_where_a_op                       ^ =,<,<=,>,>=,<>,like,not,in',
     '-                               > not              > select_where_a_not',
     '-                               > in               > select_where_a_in',
@@ -187,14 +188,16 @@ SPEC = [
     '-                               > limit            > select_where_sc_limit',
     'select_group_                   > by               > select_group_by                         ^ by',
     'select_group_by_                > name             > select_group_by_a                       ^ columns',
-    'select_group_by_a               > ,                > select_group_by_a_comma_',
+    'select_group_by_a               > name             > select_group_by_a                       ^ columns',
+    '-                               > ,                > select_group_by_a_comma_                ^ columns',
     'select_group_by_a_comma_        > name             > select_group_by_a                       ^ columns',
     'select_group_by_a_              > limit            > select_where_sc_limit                   ^ limit,order by',
     '-                               > order            > select_order',
     '-                               > order by         > select_order_by',
     'select_order_                   > by               > select_order_by                         ^ by',
     'select_order_by_                > name             > select_order_by_a                       ^ columns',
-    'select_order_by_a               > ,                > select_order_by_a_comma_',
+    'select_order_by_a               > name             > select_order_by_a                       ^ columns',
+    '-                               > ,                > select_order_by_a_comma_',
     'select_order_by_a_comma_        > name             > select_order_by_a                       ^ columns',
     'select_order_by_a_              > desc|asc         > select_order_by_a_desc                  ^ desc,asc,limit',
     '-                               > limit            > select_where_sc_limit',
@@ -213,20 +216,25 @@ SPEC = [
     '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                 > name             > select_x_join_y                         ^ tables',
     '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                    ^ columns',
-    'select_x_join_y_on_a            > comparison       > select_x_join_y_on_a_op                 ^ =',
+    'select_x_join_y_on_a            > name             > select_x_join_y_on_a                    ^ columns,=',
+    '-                               > comparison       > select_x_join_y_on_a_op',
+    '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               ^ columns',
-    'select_x_join_y_on_a_op_b       > _                > select_from_x_as_x_',
+    'select_x_join_y_on_a_op_b       > name             > select_x_join_y_on_a_op_b               ^ columns',
+    '-                               > _                > select_from_x_as_x_',
 
 
     '                                > insert           > insert',
     'insert_                         > into             > insert_into                             ^ into',
     'insert_into_                    > name             > insert_into_x                           ^ tables',
-    'insert_into_x                   > (                > insert_into_x_lp_',
+    'insert_into_x                   > name             > insert_into_x                           ^ tables',
+    '-                               > (                > insert_into_x_lp_',
     'insert_into_x_                  > (                > insert_into_x_lp_                       ^ (,values(',
     '-                               > values           > insert_values',
     'insert_into_x_lp_               > name             > insert_into_x_lp_a                      ^ id',
@@ -243,6 +251,7 @@ SPEC = [
 
     '                                > update           > update',
     'update_                         > name             > update_x                                ^ tables',
+    'update_x                        > name             > update_x                                ^ tables',
     'update_x_                       > set              > update_set                              ^ set',
     'update_set_                     > name             > update_set_a                            ^ id',
     'update_set_a                    > comparison       > update_set_a_op',
@@ -273,6 +282,7 @@ SPEC = [
     '                                > delete           > delete',
     'delete_                         > from             > delete_from                             ^ from',
     'delete_from_                    > name             > delete_from_x                           ^ tables',
+    'delete_from_x                   > name             > delete_from_x                           ^ tables',
     'delete_from_x_                  > where            > update_where                            ^ where',
 ]
 

kaqing-2.0.89/adam/version.py

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

{kaqing-2.0.87 → kaqing-2.0.89}/kaqing.egg-info/PKG-INFO

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

{kaqing-2.0.87 → kaqing-2.0.89}/setup.py

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

kaqing-2.0.87/adam/version.py

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