kaqing 2.0.88__tar.gz → 2.0.90__tar.gz

{kaqing-2.0.88 → kaqing-2.0.90}/PKG-INFO

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

{kaqing-2.0.88 → kaqing-2.0.90}/adam/commands/bash.py

@@ -38,8 +38,7 @@ class Bash(Command):
 
             return r
         else:
-            a = ' '.join(args)
-            command = f'bash -c "{a}"'
+            command = ' '.join(args)
 
             if state.pod:
                 CassandraNodes.exec(state.pod, state.namespace, command, show_out=True)
@@ -65,15 +64,16 @@ class Bash(Command):
                 if pwd := state.bash_session.pwd(state):
                     args = ['cd', pwd, '&&'] + args
 
-        a = ' '.join(args)
-        command = f'bash -c "{a}"'
+        command = ' '.join(args)
 
         rs = []
 
         if state.pod:
-            rs = [CassandraNodes.exec(state.pod, state.namespace, command, show_out=not session_just_created)]
+            rs = [CassandraNodes.exec(state.pod, state.namespace, command,
+                                      show_out=not session_just_created, shell='bash')]
         elif state.sts:
-            rs = CassandraClusters.exec(state.sts, state.namespace, command, action='bash', show_out=not session_just_created)
+            rs = CassandraClusters.exec(state.sts, state.namespace, command, action='bash',
+                                        show_out=not session_just_created, shell='bash')
 
         return rs
 

{kaqing-2.0.88 → kaqing-2.0.90}/adam/commands/cql/cql_utils.py

@@ -11,7 +11,10 @@ from adam.utils import log2
 
 @functools.lru_cache()
 def keyspaces(state: ReplState, on_any=False):
-    Config().wait_log('Inspecting Cassandra Keyspaces...')
+    if state.pod:
+        Config().wait_log(f'Inspecting Cassandra Keyspaces on {state.pod}...')
+    else:
+        Config().wait_log(f'Inspecting Cassandra Keyspaces...')
 
     r: list[PodExecResult] = run_cql(state, 'describe keyspaces', show_out=False, on_any=on_any)
     if not r:

{kaqing-2.0.88 → kaqing-2.0.90}/adam/commands/nodetool.py

@@ -7,7 +7,7 @@ from adam.config import Config
 from adam.k8s_utils.cassandra_clusters import CassandraClusters
 from adam.k8s_utils.cassandra_nodes import CassandraNodes
 from adam.repl_state import ReplState, RequiredState
-from adam.utils import log
+from adam.utils import log, random_alphanumeric
 
 class NodeTool(Command):
     COMMAND = 'nodetool'
@@ -36,6 +36,9 @@ class NodeTool(Command):
             return state
 
         user, pw = state.user_pass()
+        # if args and args[len(args) - 1] == '&':
+        #     command = f'bash -c "nohup nodetool -u {user} -pw {pw} {" ".join(args[:-1])} &> /tmp/qing-{random_alphanumeric(6)}.log &"'
+        # else:
         command = f"nodetool -u {user} -pw {pw} {' '.join(args)}"
 
         if state.pod:

{kaqing-2.0.88 → kaqing-2.0.90}/adam/embedded_params.py

@@ -1,2 +1,2 @@
 def config():
-    return {'app': {'console-endpoint': 'https://{host}/{env}/{app}/static/console/index.html', 'cr': {'cluster-regex': '(.*?-.*?)-.*', 'group': 'ops.c3.ai', 'v': 'v2', 'plural': 'c3cassandras'}, 'label': 'c3__app_id-0', 'login': {'admin-group': '{host}/C3.ClusterAdmin', 'ingress': '{app_id}-k8singr-appleader-001', 'timeout': 5, 'session-check-url': 'https://{host}/{env}/{app}/api/8/C3/userSessionToken', 'cache-creds': True, 'cache-username': True, 'url': 'https://{host}/{env}/{app}', 'another': "You're logged in to {has}. However, for this app, you need to log in to {need}.", 'token-server-url': 'http://localhost:{port}', 'password-max-length': 128}, 'strip': '0'}, 'audit': {'endpoint': 'https://4psvtaxlcb.execute-api.us-west-2.amazonaws.com/prod/', 'workers': 3, 'timeout': 10, 'log-audit-queries': False, 'athena': {'region': 'us-west-2', 'catalog': 'AwsDataCatalog', 'database': 'audit', 'tables': 'audit', 'output': 's3://s3.ops--audit/ddl/results'}}, 'bash': {'workers': 32}, 'cassandra': {'service-name': 'all-pods-service'}, 'cql': {'workers': 32, 'samples': 3, 'secret': {'cluster-regex': '(.*?-.*?)-.*', 'name': '{cluster}-superuser', 'password-item': 'password'}, 'alter-tables': {'excludes': 'system_auth,system_traces,reaper_db,system_distributed,system_views,system,system_schema,system_virtual_schema', 'gc-grace-periods': '3600,86400,864000,7776000', 'batching': True}}, 'checks': {'compactions-threshold': 250, 'cpu-busy-threshold': 98.0, 'cpu-threshold': 0.0, 'cassandra-data-path': '/c3/cassandra', 'root-disk-threshold': 50, 'cassandra-disk-threshold': 50, 'snapshot-size-cmd': "ls /c3/cassandra/data/data/*/*/snapshots | grep snapshots | sed 's/:$//g' | xargs -I {} du -sk {} | awk '{print $1}' | awk '{s+=$1} END {print s}'", 'snapshot-size-threshold': '40G', 'table-sizes-cmd': "ls -Al /c3/cassandra/data/data/ | awk '{print $9}' | sed 's/\\^r//g' | xargs -I {} du -sk /c3/cassandra/data/data/{}"}, 'get-host-id': {'workers': 32}, 'idps': {'ad': {'email-pattern': '.*@c3.ai', 'uri': 'https://login.microsoftonline.com/53ad779a-93e7-485c-ba20-ac8290d7252b/oauth2/v2.0/authorize?response_type=id_token&response_mode=form_post&client_id=00ff94a8-6b0a-4715-98e0-95490012d818&scope=openid+email+profile&redirect_uri=https%3A%2F%2Fplat.c3ci.cloud%2Fc3%2Fc3%2Foidc%2Flogin&nonce={nonce}&state=EMPTY', 'jwks-uri': 'https://login.microsoftonline.com/common/discovery/keys', 'contact': 'Please contact ted.tran@c3.ai.', 'whitelist-file': '/kaqing/members'}, 'okta': {'default': True, 'email-pattern': '.*@c3iot.com', 'uri': 'https://c3energy.okta.com/oauth2/v1/authorize?response_type=id_token&response_mode=form_post&client_id={client_id}&scope=openid+email+profile+groups&redirect_uri=https%3A%2F%2F{host}%2Fc3%2Fc3%2Foidc%2Flogin&nonce={nonce}&state=EMPTY', 'jwks-uri': 'https://c3energy.okta.com/oauth2/v1/keys'}}, 'issues': {'workers': 32}, 'logs': {'path': '/c3/cassandra/logs/system.log'}, 'medusa': {'restore-auto-complete': False}, 'nodetool': {'workers': 32, 'samples': 3, 'commands_in_line': 40}, 'pg': {'name-pattern': '^{namespace}.*-k8spg-.*', 'excludes': '.helm., -admin-secret', 'agent': {'name': 'ops-pg-agent', 'just-in-time': False, 'timeout': 86400, 'image': 'seanahnsf/kaqing'}, 'default-db': 'postgres', 'default-schema': 'postgres', 'secret': {'endpoint-key': 'postgres-db-endpoint', 'port-key': 'postgres-db-port', 'username-key': 'postgres-admin-username', 'password-key': 'postgres-admin-password'}}, 'pod': {'name': 'ops', 'image': 'seanahnsf/kaqing-cloud', 'sa': {'name': 'ops', 'proto': 'c3', 'additional-cluster-roles': 'c3aiops-k8ssandra-operator'}, 'label-selector': 'run=ops'}, 'preview': {'rows': 10}, 'processes': {'columns': 'pod,cpu,mem', 'header': 'POD_NAME,CPU,MEM/LIMIT'}, 'reaper': {'service-name': 'reaper-service', 'port-forward': {'timeout': 86400, 'local-port': 9001}, 'abort-runs-batch': 10, 'show-runs-batch': 100, 'pod': {'cluster-regex': '(.*?-.*?-.*?-.*?)-.*', 'label-selector': 'k8ssandra.io/reaper={cluster}-reaper'}, 'secret': {'cluster-regex': '(.*?-.*?)-.*', 'name': '{cluster}-reaper-ui', 'password-item': 'password'}}, 'repair': {'log-path': '/home/cassrepair/logs/', 'image': 'ci-registry.c3iot.io/cloudops/cassrepair:2.0.14', 'secret': 'ciregistryc3iotio', 'env': {'interval': 24, 'timeout': 60, 'pr': False, 'runs': 1}}, 'repl': {'start-drive': 'a', 'auto-enter-app': 'c3/c3', 'auto-enter-only-cluster': True}, 'status': {'columns': 'status,address,load,tokens,owns,host_id,gossip,compactions', 'header': '--,Address,Load,Tokens,Owns,Host ID,GOSSIP,COMPACTIONS'}, 'storage': {'columns': 'pod,volume_root,volume_cassandra,snapshots,data,compactions', 'header': 'POD_NAME,VOLUME /,VOLUME CASS,SNAPSHOTS,DATA,COMPACTIONS'}, 'watch': {'auto': 'rollout', 'timeout': 3600, 'interval': 10}, 'debug': False, 'debugs': {'timings': False, 'exit-on-error': False, 'show-parallelism': False}}
+    return {'app': {'console-endpoint': 'https://{host}/{env}/{app}/static/console/index.html', 'cr': {'cluster-regex': '(.*?-.*?)-.*', 'group': 'ops.c3.ai', 'v': 'v2', 'plural': 'c3cassandras'}, 'label': 'c3__app_id-0', 'login': {'admin-group': '{host}/C3.ClusterAdmin', 'ingress': '{app_id}-k8singr-appleader-001', 'timeout': 5, 'session-check-url': 'https://{host}/{env}/{app}/api/8/C3/userSessionToken', 'cache-creds': True, 'cache-username': True, 'url': 'https://{host}/{env}/{app}', 'another': "You're logged in to {has}. However, for this app, you need to log in to {need}.", 'token-server-url': 'http://localhost:{port}', 'password-max-length': 128}, 'strip': '0'}, 'audit': {'endpoint': 'https://4psvtaxlcb.execute-api.us-west-2.amazonaws.com/prod/', 'workers': 3, 'timeout': 10, 'log-audit-queries': False, 'athena': {'region': 'us-west-2', 'catalog': 'AwsDataCatalog', 'database': 'audit', 'tables': 'audit', 'output': 's3://s3.ops--audit/ddl/results'}}, 'bash': {'workers': 32}, 'cassandra': {'service-name': 'all-pods-service'}, 'cql': {'workers': 32, 'samples': 3, 'secret': {'cluster-regex': '(.*?-.*?)-.*', 'name': '{cluster}-superuser', 'password-item': 'password'}, 'alter-tables': {'excludes': 'system_auth,system_traces,reaper_db,system_distributed,system_views,system,system_schema,system_virtual_schema', 'gc-grace-periods': '3600,86400,864000,7776000', 'batching': True}}, 'checks': {'compactions-threshold': 250, 'cpu-busy-threshold': 98.0, 'cpu-threshold': 0.0, 'cassandra-data-path': '/c3/cassandra', 'root-disk-threshold': 50, 'cassandra-disk-threshold': 50, 'snapshot-size-cmd': "ls /c3/cassandra/data/data/*/*/snapshots | grep snapshots | sed 's/:$//g' | xargs -I {} du -sk {} | awk '{print $1}' | awk '{s+=$1} END {print s}'", 'snapshot-size-threshold': '40G', 'table-sizes-cmd': "ls -Al /c3/cassandra/data/data/ | awk '{print $9}' | sed 's/\\^r//g' | xargs -I {} du -sk /c3/cassandra/data/data/{}"}, 'get-host-id': {'workers': 32}, 'idps': {'ad': {'email-pattern': '.*@c3.ai', 'uri': 'https://login.microsoftonline.com/53ad779a-93e7-485c-ba20-ac8290d7252b/oauth2/v2.0/authorize?response_type=id_token&response_mode=form_post&client_id=00ff94a8-6b0a-4715-98e0-95490012d818&scope=openid+email+profile&redirect_uri=https%3A%2F%2Fplat.c3ci.cloud%2Fc3%2Fc3%2Foidc%2Flogin&nonce={nonce}&state=EMPTY', 'jwks-uri': 'https://login.microsoftonline.com/common/discovery/keys', 'contact': 'Please contact ted.tran@c3.ai.', 'whitelist-file': '/kaqing/members'}, 'okta': {'default': True, 'email-pattern': '.*@c3iot.com', 'uri': 'https://c3energy.okta.com/oauth2/v1/authorize?response_type=id_token&response_mode=form_post&client_id={client_id}&scope=openid+email+profile+groups&redirect_uri=https%3A%2F%2F{host}%2Fc3%2Fc3%2Foidc%2Flogin&nonce={nonce}&state=EMPTY', 'jwks-uri': 'https://c3energy.okta.com/oauth2/v1/keys'}}, 'issues': {'workers': 32}, 'logs': {'path': '/c3/cassandra/logs/system.log'}, 'medusa': {'restore-auto-complete': False}, 'nodetool': {'workers': 32, 'samples': 3, 'commands_in_line': 40}, 'pg': {'name-pattern': '^{namespace}.*-k8spg-.*', 'excludes': '.helm., -admin-secret', 'agent': {'name': 'ops-pg-agent', 'just-in-time': False, 'timeout': 86400, 'image': 'seanahnsf/kaqing'}, 'default-db': 'postgres', 'default-schema': 'postgres', 'secret': {'endpoint-key': 'postgres-db-endpoint', 'port-key': 'postgres-db-port', 'username-key': 'postgres-admin-username', 'password-key': 'postgres-admin-password'}}, 'pod': {'name': 'ops', 'image': 'seanahnsf/kaqing-cloud', 'sa': {'name': 'ops', 'proto': 'c3', 'additional-cluster-roles': 'c3aiops-k8ssandra-operator'}, 'label-selector': 'run=ops'}, 'preview': {'rows': 10}, 'processes': {'columns': 'pod,cpu,mem', 'header': 'POD_NAME,CPU,MEM/LIMIT'}, 'reaper': {'service-name': 'reaper-service', 'port-forward': {'timeout': 86400, 'local-port': 9001}, 'abort-runs-batch': 10, 'show-runs-batch': 100, 'pod': {'cluster-regex': '(.*?-.*?-.*?-.*?)-.*', 'label-selector': 'k8ssandra.io/reaper={cluster}-reaper'}, 'secret': {'cluster-regex': '(.*?-.*?)-.*', 'name': '{cluster}-reaper-ui', 'password-item': 'password'}}, 'repair': {'log-path': '/home/cassrepair/logs/', 'image': 'ci-registry.c3iot.io/cloudops/cassrepair:2.0.14', 'secret': 'ciregistryc3iotio', 'env': {'interval': 24, 'timeout': 60, 'pr': False, 'runs': 1}}, 'repl': {'start-drive': 'a', 'auto-enter-app': 'c3/c3', 'auto-enter-only-cluster': 'cluster'}, 'status': {'columns': 'status,address,load,tokens,owns,host_id,gossip,compactions', 'header': '--,Address,Load,Tokens,Owns,Host ID,GOSSIP,COMPACTIONS'}, 'storage': {'columns': 'pod,volume_root,volume_cassandra,snapshots,data,compactions', 'header': 'POD_NAME,VOLUME /,VOLUME CASS,SNAPSHOTS,DATA,COMPACTIONS'}, 'watch': {'auto': 'rollout', 'timeout': 3600, 'interval': 10}, 'debug': False, 'debugs': {'timings': False, 'exit-on-error': False, 'show-parallelism': False}}

{kaqing-2.0.88 → kaqing-2.0.90}/adam/k8s_utils/cassandra_clusters.py

@@ -1,9 +1,7 @@
-from collections.abc import Callable
 from concurrent.futures import ThreadPoolExecutor
 import sys
 from typing import TypeVar
 
-from adam.config import Config
 from adam.k8s_utils.cassandra_nodes import CassandraNodes
 from adam.pod_exec_result import PodExecResult
 from adam.utils import log2
@@ -15,10 +13,11 @@ T = TypeVar('T')
 
 # utility collection on cassandra clusters; methods are all static
 class CassandraClusters:
-    def exec(statefulset: str, namespace: str, command: str, action: str = 'action', max_workers=0, show_out=True, on_any = False) -> list[PodExecResult]:
+    def exec(statefulset: str, namespace: str, command: str, action: str = 'action',
+             max_workers=0, show_out=True, on_any = False, shell = '/bin/sh') -> list[PodExecResult]:
         def body(executor: ThreadPoolExecutor, pod: str, namespace: str, show_out: bool):
             if executor:
-                return executor.submit(CassandraNodes.exec, pod, namespace, command, False, False,)
+                return executor.submit(CassandraNodes.exec, pod, namespace, command, False, False, shell)
 
             return CassandraNodes.exec(pod, namespace, command, show_out=show_out)
 

{kaqing-2.0.88 → kaqing-2.0.90}/adam/k8s_utils/cassandra_nodes.py

@@ -5,8 +5,8 @@ from adam.pod_exec_result import PodExecResult
 
 # utility collection on cassandra nodes; methods are all static
 class CassandraNodes:
-    def exec(pod_name: str, namespace: str, command: str, show_out = True, throw_err = False) -> PodExecResult:
-        return Pods.exec(pod_name, "cassandra", namespace, command, show_out, throw_err)
+    def exec(pod_name: str, namespace: str, command: str, show_out = True, throw_err = False, shell = '/bin/sh') -> PodExecResult:
+        return Pods.exec(pod_name, "cassandra", namespace, command, show_out = show_out, throw_err = throw_err, shell = shell)
 
     def get_host_id(pod_name: str, ns: str):
         try:

{kaqing-2.0.88 → kaqing-2.0.90}/adam/k8s_utils/pods.py

@@ -10,7 +10,7 @@ from kubernetes.stream.ws_client import ERROR_CHANNEL
 from adam.config import Config
 from adam.k8s_utils.volumes import ConfigMapMount
 from adam.pod_exec_result import PodExecResult
-from adam.utils import elapsed_time, log2
+from adam.utils import elapsed_time, log2, random_alphanumeric
 from .kube_context import KubeContext
 
 T = TypeVar('T')
@@ -93,7 +93,8 @@ class Pods:
 
             return results
 
-    def exec(pod_name: str, container: str, namespace: str, command: str, show_out = True, throw_err = False, interaction: Callable[[any, list[str]], any] = None):
+    def exec(pod_name: str, container: str, namespace: str, command: str, show_out = True, throw_err = False, shell = '/bin/sh',
+             interaction: Callable[[any, list[str]], any] = None):
         if _TEST_POD_EXEC_OUTS:
             return _TEST_POD_EXEC_OUTS
 
@@ -101,8 +102,15 @@ class Pods:
 
         api = client.CoreV1Api()
 
-        exec_command = ["/bin/sh", "-c", command]
-        k_command = f'kubectl exec {pod_name} -c {container} -n {namespace} -- {command}'
+        tty = True
+        exec_command = [shell, '-c', command]
+        if command.endswith(' &'):
+            command = f"nohup {command.strip(' &')} > /tmp/qing-{random_alphanumeric(6)}.log 2>&1 &"
+            exec_command = [shell, '-c', command]
+            # should be false for starting a backgroud process
+            tty = False
+
+        k_command = f'kubectl exec {pod_name} -c {container} -n {namespace} -- {shell} -c "{command}"'
         if show_out:
             print(k_command)
 
@@ -115,7 +123,7 @@ class Pods:
             stderr=True,
             stdin=True,
             stdout=True,
-            tty=True,
+            tty=tty,
             _preload_content=False,
         )
 
@@ -140,7 +148,7 @@ class Pods:
             try:
                 # get the exit code from server
                 error_output = resp.read_channel(ERROR_CHANNEL)
-            except Exception:
+            except Exception as e:
                 pass
         except Exception as e:
             if throw_err:

{kaqing-2.0.88 → kaqing-2.0.90}/adam/k8s_utils/secrets.py

@@ -1,4 +1,5 @@
 import base64
+import functools
 import re
 from typing import cast
 from kubernetes import client
@@ -9,6 +10,7 @@ from adam.utils import log2
 
 # utility collection on secrets; methods are all static
 class Secrets:
+    @functools.lru_cache()
     def list_secrets(namespace: str = None, name_pattern: str = None):
         Config().wait_log('Inspecting Cassandra Instances...')
 

{kaqing-2.0.88 → kaqing-2.0.90}/adam/repl.py

@@ -69,13 +69,16 @@ def enter_repl(state: ReplState):
     Log.log2(f'kaqing {__version__}')
 
     if state.device == ReplState.C:
+        auto_enter = Config().get('repl.auto-enter-only-cluster', 'cluster')
         ss = StatefulSets.list_sts_name_and_ns()
         if not ss:
             raise Exception("no Cassandra clusters found")
-        elif not state.sts and len(ss) == 1 and Config().get('repl.auto-enter-only-cluster', True):
+        elif not state.sts and len(ss) == 1 and auto_enter in ['cluster', 'first-pod']:
             cluster = ss[0]
             state.sts = cluster[0]
             state.namespace = cluster[1]
+            if auto_enter == 'first-pod':
+                state.pod = f'{state.sts}-0'
             if KubeContext().in_cluster_namespace:
                 Config().wait_log(f'Moving to the only Cassandra cluster: {state.sts}...')
             else:

{kaqing-2.0.88 → kaqing-2.0.90}/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                       ^ =,<,<=,>,>=,<>',
+    '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.90/adam/version.py

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

{kaqing-2.0.88 → kaqing-2.0.90}/kaqing.egg-info/PKG-INFO

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

{kaqing-2.0.88 → kaqing-2.0.90}/setup.py

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

kaqing-2.0.88/adam/version.py

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