kaqing 2.0.72__tar.gz → 2.0.74__tar.gz

{kaqing-2.0.72 → kaqing-2.0.74}/PKG-INFO

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

{kaqing-2.0.72 → kaqing-2.0.74}/adam/sql/state_machine.py

@@ -136,10 +136,10 @@ SPEC = [
     'select_a_                       > from             > select_from                             ^ from',
     'select_from_                    > name             > select_from_x                           ^ (select,tables',
     '-                               > (                > select_from_lp_',
-    '-                               < )                > select_from_ns',
+    '-                               < )                > select_from_sq',
     'select_from_lp_                 > select           > select',
     'select_from_x                   > ,                > select_from_x_comma_',
-    'select_from_ns_                 > as               > select_from_x_as                        ^ as',
+    '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,limit',
     'select_from_x_as_x_             > ,                > select_from_x_comma_                    ^ where,inner join,left outer join,right outer join,full outer join,group by,limit',
@@ -348,10 +348,16 @@ class StateMachine:
             self.states[f'{from_s} > {t}'] = StateTo(to_s)
 
     def add_comeback_transition(self, from_s: str, token: str, to_s: str):
-        orig = self.states[f'{from_s} > (']
+        key = f'{from_s} > ('
+        orig = self.states[key]
+        if not orig:
+            raise Exception(f'from state not found for {key}')
+
         orig.comeback_token = token
         orig.comeback_state = to_s
-        self.states[f'{from_s} > ('] = orig
+        if self.debug:
+            print(f'{from_s} > ) = {to_s}')
+        self.states[key] = orig
 
     def traverse_tokens(self, tokens: list[Token], state: StateTo = StateTo('')):
         def handle_opening_parenthesis():

kaqing-2.0.74/adam/version.py

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

{kaqing-2.0.72 → kaqing-2.0.74}/kaqing.egg-info/PKG-INFO

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

{kaqing-2.0.72 → kaqing-2.0.74}/setup.py

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

kaqing-2.0.72/adam/version.py

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