kaqing 2.0.48__py3-none-any.whl → 2.0.50__py3-none-any.whl

adam/batch.py

@@ -5,7 +5,7 @@ from adam.commands.check import Check, CheckCommandHelper
 from adam.commands.cp import ClipboardCopy, CopyCommandHelper
 from adam.commands.command import Command
 from adam.commands.command_helpers import ClusterCommandHelper, ClusterOrPodCommandHelper, PodCommandHelper
-from adam.commands.cqlsh import CqlCommandHelper, Cqlsh
+from adam.commands.cql.cqlsh import CqlCommandHelper, Cqlsh
 from adam.commands.deploy.deploy import Deploy, DeployCommandHelper
 from adam.commands.deploy.undeploy import Undeploy, UndeployCommandHelper
 from adam.commands.describe.describe import Describe, DescribeCommandHelper

adam/commands/alter_tables.py

@@ -1,5 +1,5 @@
 from adam.commands.command import Command
-from adam.commands.cql_utils import tables as get_tables, run_cql
+from adam.commands.cql.cql_utils import tables as get_tables, run_cql
 from adam.config import Config
 from adam.pod_exec_result import PodExecResult
 from adam.repl_state import ReplState, RequiredState

adam/commands/cql/cql_completions.py

@@ -0,0 +1,13 @@
+from adam.commands.cql.cql_table_completer import CqlTableNameCompleter
+from adam.commands.cql.cql_utils import table_names
+from adam.repl_state import ReplState
+from adam.sql.sql_completer import SqlCompleter
+
+def cql_completions(state: ReplState) -> dict[str, any]:
+    table_name_completer = CqlTableNameCompleter(table_names(state))
+    return {
+        'describe': {
+            'keyspaces': None,
+            'table': table_name_completer,
+            'tables': None},
+    } | SqlCompleter.completions(table_name_completer)

adam/commands/cql/cql_table_completer.py

@@ -0,0 +1,16 @@
+from adam.sql.table_name_completer import NestedDict, TableNameCompleter
+
+class CqlTableNameCompleter(TableNameCompleter):
+    def __init__(self, tables: list[str], nested_dict: NestedDict = {}, ignore_case: bool = True):
+        self._tables = tables
+        self.ignore_case = ignore_case
+        self.append_nested_dict(nested_dict)
+
+    def __repr__(self) -> str:
+        return "CqlTableCompleter(%r)" % (len(self._tables))
+
+    def nested(self, data: NestedDict) -> 'TableNameCompleter':
+        return CqlTableNameCompleter(self._tables).append_nested_dict(data)
+
+    def tables(self) -> list[str]:
+        return self._tables

adam/commands/{cqlsh.py → cql/cqlsh.py}

@@ -2,7 +2,8 @@ import click
 
 from adam.commands.command import Command
 from adam.commands.command_helpers import ClusterOrPodCommandHelper
-from adam.commands.cql_utils import run_cql, table_names, tables
+from adam.commands.cql.cql_completions import cql_completions
+from .cql_utils import run_cql, table_names
 from adam.repl_state import ReplState, RequiredState
 from adam.utils import log, log2
 
@@ -53,21 +54,12 @@ class Cqlsh(Command):
         return run_cql(state, cql, opts, show_out=True)
 
     def completion(self, state: ReplState) -> dict[str, any]:
+        if state.device != state.C:
+            # conflicts with psql completions
+            return {}
+
         if state.sts or state.pod:
-            ts = table_names(state)
-            return {Cqlsh.COMMAND: None} | {
-                'delete': {'from': {t: {'where': {'id': {'=': None}}} for t in ts}},
-                'insert': {'into': {t: {'values': None} for t in ts}},
-                'select': {'*': {'from': {t: {
-                    'limit': {'1': None},
-                    'where': {'id': {'=': None}}
-                } for t in ts}}},
-                'update': {t: {'set': None} for t in ts},
-                'describe': {
-                    'keyspaces': None,
-                    'table': {t: None for t in ts},
-                    'tables': None},
-            }
+            return {Cqlsh.COMMAND: None} | cql_completions(state)
 
         return {}
 

adam/commands/describe/describe_keyspace.py

@@ -1,5 +1,5 @@
 from adam.commands.command import Command
-from adam.commands.cql_utils import keyspaces, run_cql
+from adam.commands.cql.cql_utils import keyspaces, run_cql
 from adam.pod_exec_result import PodExecResult
 from adam.repl_state import ReplState, RequiredState
 from adam.utils import log2

adam/commands/describe/describe_keyspaces.py

@@ -1,5 +1,5 @@
 from adam.commands.command import Command
-from adam.commands.cql_utils import run_cql
+from adam.commands.cql.cql_utils import run_cql
 from adam.pod_exec_result import PodExecResult
 from adam.repl_state import ReplState, RequiredState
 from adam.utils import log2

adam/commands/describe/describe_table.py

@@ -1,5 +1,5 @@
 from adam.commands.command import Command
-from adam.commands.cql_utils import run_cql, table_names
+from adam.commands.cql.cql_utils import run_cql, table_names
 from adam.pod_exec_result import PodExecResult
 from adam.repl_state import ReplState, RequiredState
 from adam.utils import log2

adam/commands/describe/describe_tables.py

@@ -1,5 +1,5 @@
 from adam.commands.command import Command
-from adam.commands.cql_utils import run_cql
+from adam.commands.cql.cql_utils import run_cql
 from adam.pod_exec_result import PodExecResult
 from adam.repl_state import ReplState, RequiredState
 from adam.utils import log2

adam/commands/ls.py

@@ -2,7 +2,7 @@ import copy
 
 from adam.commands.command import Command
 from adam.commands.commands_utils import show_pods, show_rollout
-from adam.commands.cqlsh import Cqlsh
+from adam.commands.cql.cqlsh import Cqlsh
 from adam.commands.postgres.postgres_utils import pg_database_names, pg_table_names
 from adam.commands.postgres.postgres_session import PostgresSession
 from adam.config import Config

adam/commands/medusa/medusa_restore.py

@@ -59,8 +59,7 @@ class MedusaRestore(Command):
         now_dtformat = datetime.now().strftime("%Y-%m-%d.%H.%M.%S")
         rtname = 'medusa-' + now_dtformat + '-restore-from-' + bkname
         try:
-            print('SEAN doing')
-            # CustomResources.create_medusa_restorejob(rtname, bkname, dc, ns)
+            CustomResources.create_medusa_restorejob(rtname, bkname, dc, ns)
         except Exception as e:
             log2("Exception: MedusaRestore failed: %s\n" % e)
 

adam/commands/postgres/postgres.py

@@ -1,7 +1,7 @@
 import click
 
 from adam.commands.command import Command
-from adam.commands.postgres.pg_completions import pg_completions
+from adam.commands.postgres.psql_completions import psql_completions
 from adam.commands.postgres.postgres_utils import pg_table_names
 from .postgres_ls import PostgresLs
 from .postgres_preview import PostgresPreview
@@ -65,11 +65,15 @@ class Postgres(Command):
         PostgresSession(state.namespace, state.pg_path).run_sql(' '.join(args))
 
     def completion(self, state: ReplState):
+        if state.device != state.P:
+            # conflicts with cql completions
+            return {}
+
         leaf = {}
         session = PostgresSession(state.namespace, state.pg_path)
         if session.db:
           if pg_table_names(state.namespace, state.pg_path):
-            leaf = pg_completions(state.namespace, state.pg_path)
+            leaf = psql_completions(state.namespace, state.pg_path)
         elif state.pg_path:
             leaf = {
                 '\h': None,

adam/commands/postgres/psql_completions.py

@@ -0,0 +1,11 @@
+from adam.commands.postgres.psql_table_completer import PsqlTableNameCompleter
+from adam.sql.sql_completer import SqlCompleter
+
+def psql_completions(ns: str, pg_path: str):
+    return {
+        '\h': None,
+        '\d': None,
+        '\dt': None,
+        '\du': None
+    } | SqlCompleter.completions(PsqlTableNameCompleter(ns, pg_path))
+    # } | PsqlTableCompleter(ns, pg_path).completions()

adam/commands/postgres/psql_table_completer.py

@@ -0,0 +1,18 @@
+from adam.commands.postgres.postgres_utils import pg_table_names
+from adam.sql.table_name_completer import NestedDict, TableNameCompleter
+
+class PsqlTableNameCompleter(TableNameCompleter):
+    def __init__(self, namespace: str, pg_path: str, nested_dict: NestedDict = {}, ignore_case: bool = True):
+        self.namespace = namespace
+        self.pg_path = pg_path
+        self.ignore_case = ignore_case
+        self.append_nested_dict(nested_dict)
+
+    def __repr__(self) -> str:
+        return "PsqlTableCompleter(%r, pg_path=%r)" % (self.namespace, self.pg_path)
+
+    def nested(self, data: NestedDict) -> 'TableNameCompleter':
+        return PsqlTableNameCompleter(self.namespace, self.pg_path).append_nested_dict(data)
+
+    def tables(self) -> list[str]:
+        return pg_table_names(self.namespace, self.pg_path)

adam/commands/preview_table.py

@@ -1,8 +1,9 @@
 import functools
 
 from adam.commands.command import Command
-from adam.commands.cql_utils import run_cql, tables
-from adam.commands.postgres.pg_table_completer import PgTableCompleter
+from adam.commands.cql.cql_table_completer import CqlTableNameCompleter
+from adam.commands.cql.cql_utils import run_cql, table_names, tables
+from adam.commands.postgres.psql_table_completer import PsqlTableNameCompleter
 from adam.commands.postgres.postgres_session import PostgresSession
 from adam.config import Config
 from adam.repl_state import ReplState, RequiredState
@@ -72,11 +73,9 @@ class PreviewTable(Command):
 
     def completion(self, state: ReplState):
         if state.device == ReplState.P:
-            # return {PreviewTable.COMMAND: {f'<pg_tables:{state.namespace}:{state.pg_path}>': None}}
-            return {PreviewTable.COMMAND: PgTableCompleter(state.namespace, state.pg_path)}
+            return {PreviewTable.COMMAND: PsqlTableNameCompleter(state.namespace, state.pg_path)}
         elif state.sts:
-            tables = PreviewTable.cql_tables(state)
-            return {PreviewTable.COMMAND: {f'{k}.{t}': None for k, ts in tables.items() for t in ts}}
+            return {PreviewTable.COMMAND: CqlTableNameCompleter(table_names(state))}
 
         return {}
 

adam/repl.py

@@ -18,6 +18,7 @@ from adam.log import Log
 from adam.repl_commands import ReplCommands
 from adam.repl_session import ReplSession
 from adam.repl_state import ReplState
+from adam.sql.sql_completer import SqlCompleter
 from adam.utils import deep_merge_dicts, deep_sort_dict, lines_to_tabular, log2
 from adam.apps import Apps
 from . import __version__
@@ -108,7 +109,7 @@ def enter_repl(state: ReplState):
                             log2(f'Timing auto-completion-calc {cmd.command()}: {time.time() - s1:.2f}')
 
                 # print(json.dumps(completions, indent=4))
-                completer = NestedCompleter.from_nested_dict(completions)
+                completer = SqlCompleter.from_nested_dict(completions)
 
             cmd = session.prompt(prompt_msg(), completer=completer, key_bindings=kb)
             s0 = time.time()

adam/repl_commands.py

@@ -23,7 +23,7 @@ from adam.commands.bash import Bash
 from adam.commands.cd import Cd
 from adam.commands.check import Check
 from adam.commands.command import Command
-from adam.commands.cqlsh import Cqlsh
+from adam.commands.cql.cqlsh import Cqlsh
 from adam.commands.devices import DeviceApp, DeviceCass, DevicePostgres
 from adam.commands.exit import Exit
 from adam.commands.medusa.medusa import Medusa

adam/{commands/postgres/pg_table_completer.py → sql/any_completer.py}

@@ -2,24 +2,17 @@ from typing import Any, Dict, Iterable, Mapping, Optional, Set, Union
 from prompt_toolkit.completion import CompleteEvent, Completer, Completion, NestedCompleter, WordCompleter
 from prompt_toolkit.document import Document
 
-from adam.commands.postgres.postgres_utils import pg_table_names
+from adam.sql.sql_utils import safe_terms
 
 NestedDict = Mapping[str, Union[Any, Set[str], None, Completer]]
 
-class PgTableCompleter(Completer):
-    def __init__(self, namespace: str, pg_path: str, nested_dict: NestedDict = {}, ignore_case: bool = True):
-        self.namespace = namespace
-        self.pg_path = pg_path
+class AnyCompleter(Completer):
+    def __init__(self, default: str = None, nested_dict: NestedDict = {}, ignore_case: bool = True):
+        self.default = default
         self.ignore_case = ignore_case
         self.append_nested_dict(nested_dict)
 
-    def __repr__(self) -> str:
-        return "PgTableCompleter(%r, pg_path=%r)" % (self.namespace, self.pg_path)
-
-    def nested(self, data: NestedDict):
-        return PgTableCompleter(self.namespace, self.pg_path).append_nested_dict(data)
-
-    def append_nested_dict(self, data: NestedDict) -> "PgTableCompleter":
+    def append_nested_dict(self, data: NestedDict) -> "AnyCompleter":
         options: Dict[str, Optional[Completer]] = {}
         for key, value in data.items():
             if isinstance(value, Completer):
@@ -42,18 +35,18 @@ class PgTableCompleter(Completer):
         text = document.text_before_cursor.lstrip()
         stripped_len = len(document.text_before_cursor) - len(text)
 
-        if " " in text:
+        terms, has_space = safe_terms(text)
+        if has_space:
             second_term = None
-            tokens = text.split()
-            if len(tokens) > 1:
-                second_term = tokens[1]
+            if len(terms) > 1:
+                second_term = terms[1]
 
             yielded = False
             if second_term:
                 completer = self.options.get(second_term)
 
                 if completer is not None:
-                    first_term = tokens[0]
+                    first_term = terms[0]
                     remaining_text = text[len(first_term) :].lstrip()
                     move_cursor = len(text) - len(remaining_text) + stripped_len
 
@@ -75,9 +68,17 @@ class PgTableCompleter(Completer):
                 )
                 for c in completer.get_completions(document, complete_event):
                     yield c
-        else:
-            completer = WordCompleter(
-                list(pg_table_names(self.namespace, self.pg_path)), ignore_case=self.ignore_case
-            )
-            for c in completer.get_completions(document, complete_event):
-                yield c
+        elif words := self.words():
+            for c in words.get_completions(document, complete_event):
+                yield c
+
+    def words(self):
+        if not self.default:
+            return None
+
+        return WordCompleter(
+            [self.default], ignore_case=self.ignore_case
+        )
+
+    def nested(self, data: NestedDict) -> 'AnyCompleter':
+        return AnyCompleter(self.default).append_nested_dict(data)

adam/sql/sql_completer.py

@@ -0,0 +1,53 @@
+from typing import Dict, Iterable, Optional
+from prompt_toolkit.completion import CompleteEvent, Completer, Completion, NestedCompleter, WordCompleter
+from prompt_toolkit.document import Document
+
+from adam.sql.any_completer import AnyCompleter as any
+from adam.sql.sql_utils import safe_terms
+from adam.sql.table_name_completer import TableNameCompleter
+
+class SqlCompleter(NestedCompleter):
+    def __init__(
+        self, options: Dict[str, Optional[Completer]], ignore_case: bool = True
+    ) -> None:
+        super().__init__(options, ignore_case)
+
+    def get_completions(
+        self, document: Document, complete_event: CompleteEvent
+    ) -> Iterable[Completion]:
+        text = document.text_before_cursor.lstrip()
+        stripped_len = len(document.text_before_cursor) - len(text)
+
+        terms, has_space = safe_terms(text)
+        if has_space:
+            first_term = terms[0]
+            completer = self.options.get(first_term)
+
+            if completer is not None:
+                remaining_text = text[len(first_term) :].lstrip()
+                move_cursor = len(text) - len(remaining_text) + stripped_len
+
+                new_document = Document(
+                    remaining_text,
+                    cursor_position=document.cursor_position - move_cursor,
+                )
+
+                for c in completer.get_completions(new_document, complete_event):
+                    yield c
+        else:
+            completer = WordCompleter(
+                list(self.options.keys()), ignore_case=self.ignore_case
+            )
+            for c in completer.get_completions(document, complete_event):
+                yield c
+
+    def completions(table: TableNameCompleter):
+        return {
+            'delete': {'from': table.nested({'where': any('id').nested({'=': any("'id'")})})},
+            'insert': {'into': table.nested({'values(': None})},
+            'select': any('*').nested({'from': table.nested({
+                'limit': any('1'),
+                'where': any('id').nested({'=': any("'id'").nested({'limit': any('1')})})
+            })}),
+            'update': table.nested({'set': {'column': {'=': None}}}),
+        }

adam/sql/sql_utils.py

@@ -0,0 +1,5 @@
+import re
+
+def safe_terms(text: str):
+    tokens = re.findall(r'"[^"]+"|\b\w+\b|\S', text)
+    return tokens, len(tokens) > 1 or text.startswith(' ') or text.endswith(' ')

adam/sql/table_name_completer.py

@@ -0,0 +1,17 @@
+from abc import abstractmethod
+from prompt_toolkit.completion import  WordCompleter
+
+from .any_completer import AnyCompleter, NestedDict
+
+class TableNameCompleter(AnyCompleter):
+    def __init__(self, nested_dict: NestedDict = {}, ignore_case: bool = True):
+        super().__init__(nested_dict=nested_dict, ignore_case=ignore_case)
+
+    def words(self):
+        return WordCompleter(
+            self.tables(), ignore_case=self.ignore_case
+        )
+
+    @abstractmethod
+    def tables(self) -> list[str]:
+        pass

adam/version.py

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

{kaqing-2.0.48.dist-info → kaqing-2.0.50.dist-info}/METADATA

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

{kaqing-2.0.48.dist-info → kaqing-2.0.50.dist-info}/RECORD

@@ -1,7 +1,7 @@
 adam/__init__.py,sha256=oVw1FNd9HZPJ7wm6BNn5ybyNGJLjJ8kopMeBiwgMaOI,59
 adam/app_session.py,sha256=Klypm4JYHOlovaRCHAZ2P_Mj_nheMlcQgX403R0TJGk,6969
 adam/apps.py,sha256=UTpUJBAMRFvR8kJZwileGC0UmPvsOjJ_AgvWoGmnIFI,6701
-adam/batch.py,sha256=zUVW9PeOIybXY8sJksJfOlEEkeikBsu5PrukAhnGcgc,24503
+adam/batch.py,sha256=F2FmdYj9bgNAIwT_L9ugafVCBj7j45IHNtbzF3b3zjg,24507
 adam/cli.py,sha256=03pIZdomAu7IL-GSP6Eun_PKwwISShRAmfx6eVRPGC0,458
 adam/cli_group.py,sha256=W3zy1BghCtVcEXizq8fBH-93ZRVVwgAyGPzy0sHno1Y,593
 adam/config.py,sha256=hDxd86MbKVVKoHhTT077L3YRKYcr0i6xVADLlnoE684,2818
@@ -9,12 +9,12 @@ adam/embedded_apps.py,sha256=lKPx63mKzJbNmwz0rgL4gF76M9fDGxraYTtNAIGnZ_s,419
 adam/embedded_params.py,sha256=_9tBKpkSzBfzm-s3tUgZs8DcSVBnPA1iumG0ZRCbZIs,4586
 adam/log.py,sha256=gg5DK52wLPc9cjykeh0WFHyAk1qI3HEpGaAK8W2dzXY,1146
 adam/pod_exec_result.py,sha256=nq0xnCNOpUGBSijGF0H-YNrwBc9vUQs4DkvLMIFS5LQ,951
-adam/repl.py,sha256=X9ga1iZFIXADQxBXvztFyVNBrfBRxiFLxTUYkm11img,7328
-adam/repl_commands.py,sha256=aH7xxbsQGrpL9Ozk9QF54iToK6wbDT3Pu9rMyw9sDBY,4719
+adam/repl.py,sha256=ACIBgqitFt5z6lKFSeF4JOXbnCa3seZHWxFiMJ5Q9zw,7373
+adam/repl_commands.py,sha256=WA90Rl27Juctzr3U3kfCDk5N-oYMKlfWbZeafUgk7k0,4723
 adam/repl_session.py,sha256=uIogcvWBh7wd8QQ-p_JgLsyJ8YJgINw5vOd6JIsd7Vo,472
 adam/repl_state.py,sha256=591d7gV6uQSFtm7IWdlIYAHjfAzs9bdvIkwlIAeKddE,7540
 adam/utils.py,sha256=2DoWsrcaioFFH0-RjT30qelVRPUJqCGTfz_ucfE7F8g,7406
-adam/version.py,sha256=9Kcgme2wMsEUv7PtuqbSWgv9AerCTt2iKa01qp9aono,139
+adam/version.py,sha256=LFuTm_lavjxHMfAJnqFwLX9zL3RVjQ6n-Au9M0IztXo,139
 adam/checks/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 adam/checks/check.py,sha256=Qopr3huYcMu2bzQgb99dEUYjFzkjKHRI76S6KA9b9Rk,702
 adam/checks/check_context.py,sha256=FEHkQ32jY1EDopQ2uYWqy9v7aEEX1orLpJWhopwAlh4,402
@@ -47,7 +47,7 @@ adam/columns/pod_name.py,sha256=IYw0ZKA7Fb9LaGXENqzZTiTgL98tahwFRtfy0KkKh2Q,280
 adam/columns/volume_cassandra.py,sha256=9KRNOzjNYganI9avN6zaA5_-7yxD4rV-KNxro9CSUg4,753
 adam/columns/volume_root.py,sha256=29ujLoCAf9LO75u62LxEaPD58s6ihV-tcK17OeLSOM0,556
 adam/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-adam/commands/alter_tables.py,sha256=Y5cWg0Ow93rIDusbHgxQcC7sSB64LmULTlDxPLybiVM,3578
+adam/commands/alter_tables.py,sha256=Q5vXHE4_1_6v6wtYwqST7_QwpXINb1xq0Sm448Z2Y7Q,3582
 adam/commands/app.py,sha256=7alV8wK801t67_rUe6EmhtHJTl-6K7fGCm6Uz1dDgpM,1963
 adam/commands/app_ping.py,sha256=Xk7cfefphXM2w-UvpnhNUTZ3BU38f0deehUb2FEyLCI,1337
 adam/commands/bash.py,sha256=1O9cCl9JHQdttqNAgdB44rO0NjCqHzHv4psAEQMJcjw,2714
@@ -58,26 +58,29 @@ adam/commands/command.py,sha256=Ph7IduCTGQ04dcwNegl1ekYbqCzOwAOYeWZVIRWnKyU,3958
 adam/commands/command_helpers.py,sha256=leOJJK1UXczNTJHN9TGMCbIpUpmpreULvQ-TvnsYS7w,1134
 adam/commands/commands_utils.py,sha256=ShUcxtDSd9B3NM0GDj3NBvKdmjCGY8qXgeUJpzNF63E,3122
 adam/commands/cp.py,sha256=dyQViRDPNqsKRkxPb7WyEVIBNw7YB6IfYa2q3VtfzyA,3107
-adam/commands/cql_utils.py,sha256=q5hzAUVh7h8iVVH2s0M4E76zWqaMUDXULMn412mfHII,3893
-adam/commands/cqlsh.py,sha256=PknA1I13E4L6leSq6TC3fsyJw_bugo6376q0FE0Ufz0,3088
 adam/commands/devices.py,sha256=_f8j6aQzTL8_pFlWYawRuG2Ju1zPjYSPcRIlLnZng10,2397
 adam/commands/exit.py,sha256=5MWUAmzYBlsrp0CoiTDB13SUkX9Ya18UlGeOIPia6TA,798
 adam/commands/help.py,sha256=Ey3R1X8w_CMhdADI0t8dSQ28euhDHheJm7NermiGni4,1645
 adam/commands/issues.py,sha256=VS-PC7e-2lywsa-lbmoUX8IY77OPGzFudwbw1g8XmQc,2599
 adam/commands/login.py,sha256=bj95WWIF7mJDJhnyS9T8xvaZUGL37dj7GlH8TgmODbk,1877
 adam/commands/logs.py,sha256=T-O9DYXmWEm4G1I5SM6MwyeRwq2aT-WMqNW0XA2MWmo,1165
-adam/commands/ls.py,sha256=X_dSitiwMsKh6wi5P6OdF50a5eUCFv_-Huem7Qzff_s,5572
+adam/commands/ls.py,sha256=ZOhY_vEjOEbvI5n8c9ha-SqmJwK2b7sF94G1gDoQ5Y0,5576
 adam/commands/nodetool.py,sha256=HV9yDzMhRjS4lw6UfV7Hc1pcmeSx5a1jU6cAEKSZ1Bg,2334
 adam/commands/nodetool_commands.py,sha256=5IgWC3rmeDD1cgwqQjiiWzi-wJpJ3n_8pAzz_9phXuk,2635
 adam/commands/param_get.py,sha256=kPAAppK2T0tEFRnSIVFLDPIIGHhgLA7drJhn8TRyvvE,1305
 adam/commands/param_set.py,sha256=QDIuqfU80aWCB16OK49yf7XRaRTWwiLkwMsJuVikq9I,1271
-adam/commands/preview_table.py,sha256=6h6GfyRIsMH1h9isV4rgMOhq704K20soqt_dM1tDdec,3136
+adam/commands/preview_table.py,sha256=EJZms-8sXqwDDNjix92z2tpU9823-WKv6y-Z3A7ucao,3068
 adam/commands/pwd.py,sha256=VlgFjxFl66I7Df1YI6cuiEeY6Q13lEavMKfrzHLESKo,2340
 adam/commands/report.py,sha256=Ky45LIzSlB_X4V12JZWjU3SA2u4_FKRencRTq7psOWU,1944
 adam/commands/restart.py,sha256=Hik1t5rjH2ATZv4tzwrGB3e44b3dNuATgY327_Nb8Bs,2044
 adam/commands/rollout.py,sha256=52_4ijna3v-8Oug12et43DRHFDNhiN34p6xLTQmhdbQ,2959
 adam/commands/shell.py,sha256=wY_PIx7Lt6vuxhFArlfxdEnBbrouCJ3yNHhFn17DEqw,848
 adam/commands/watch.py,sha256=mmBFpB8T1V7zrNs5b2YNyDDztMym_ILPDdkrbdAXTas,2438
+adam/commands/cql/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+adam/commands/cql/cql_completions.py,sha256=BfaBlLMBdSSbuYmuyVMhOcJ7IgELvYKJroq4qOjoZWc,529
+adam/commands/cql/cql_table_completer.py,sha256=ktTXC_Ii8NhxRbvUebc_Rg__Z7v2faQJBt3mR-5LPoI,633
+adam/commands/cql/cql_utils.py,sha256=q5hzAUVh7h8iVVH2s0M4E76zWqaMUDXULMn412mfHII,3893
+adam/commands/cql/cqlsh.py,sha256=qEQufaDVi9FXkvruum6OHQDfLX01DVWVDnWsAjyCZYQ,2661
 adam/commands/deploy/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 adam/commands/deploy/code_start.py,sha256=-iH8HThTNM83IfBxT_LqTByuHVatV9d-Il4OYOfrwLI,1370
 adam/commands/deploy/code_stop.py,sha256=ch7ZMgosvTHsGaIcDwQY5XYh_5HYrUjBkZFOI-d2gOU,1696
@@ -93,24 +96,24 @@ adam/commands/deploy/undeploy_pg_agent.py,sha256=RYME8no1FT94WpVg-HXDGL1NmLlpE1I
 adam/commands/deploy/undeploy_pod.py,sha256=hTcL8cAh7xYPcSm9sgiVFCxPh3SskefBfTmla310oUA,1905
 adam/commands/describe/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 adam/commands/describe/describe.py,sha256=isRQ1z3lrFtaSkeWPndLGvaIbZivlBxI8D1X8ywNe1E,1510
-adam/commands/describe/describe_keyspace.py,sha256=CdgDBMlOngp_P5dK4QbqmqEGVZfhrRcFyISSrXoXoa4,1927
-adam/commands/describe/describe_keyspaces.py,sha256=O6ZY3q7H3-fNDEHf_qjgfTQmdYPXExAZh1M1COPJbnM,1574
-adam/commands/describe/describe_table.py,sha256=HL9Bufqj60R7GqqfhMvNgb6-eGPpOOf_okHoNT-2B9s,1883
-adam/commands/describe/describe_tables.py,sha256=2EtkLavSTNy-JHtegR9qUoVYs2NPmAz1Tq-yc-hKzZY,1553
+adam/commands/describe/describe_keyspace.py,sha256=ug2xqddB-2VST8PdlEIc_tLE-8dqe2GMQk30t68ymm0,1931
+adam/commands/describe/describe_keyspaces.py,sha256=P3AbUIxm-KiuM98DjK7I2MGjj8bjZwOm5qN1-Y4tHzA,1578
+adam/commands/describe/describe_table.py,sha256=k4cbVkHkpCuFD3grne58sDPFZFG7e21DWtxAg2b_uUw,1887
+adam/commands/describe/describe_tables.py,sha256=vIs4lKz4nHBJumOlR4wBhR1QxXTFqzXCq-DNOO04CVE,1557
 adam/commands/medusa/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 adam/commands/medusa/medusa.py,sha256=KNFjStvilIuOJt3wTtcWmKvdm8FdCnrDY2ltEWbratk,1402
 adam/commands/medusa/medusa_backup.py,sha256=j4DTVWFT-4rzs4gG_pBvjE-JuPsVCJIsnyQjIzJ4EbA,1801
-adam/commands/medusa/medusa_restore.py,sha256=MU47bmozrjfGJ6GVkj_OVgLH6Uz_fGh03MdLR4ZDKHE,3308
+adam/commands/medusa/medusa_restore.py,sha256=GSjwsZYCqRA-XmJ1f6VELzX9cKXh5NDwxyBoGEiqUXY,3274
 adam/commands/medusa/medusa_show_backupjobs.py,sha256=QekHpKezVJdgfa9hOxfgyx-y4D08tmHzyu_AAa8QPR0,1756
 adam/commands/medusa/medusa_show_restorejobs.py,sha256=wgPonSmC6buDIp3k3WUY-Yu2MyP1xyE3Q_XhvAwpnx4,1651
 adam/commands/postgres/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-adam/commands/postgres/pg_completions.py,sha256=hhFKpGt4fCkicAAwlCX8n7pe6N8Wau_nhmL3TJqPQcM,669
-adam/commands/postgres/pg_table_completer.py,sha256=QVypmCrKpxebPDpPpQC_NqS97M6c5ChXcFqPVzokTkQ,3330
-adam/commands/postgres/postgres.py,sha256=cwMzevef1Vo06zNTl74T2f4Lpv5aG006M0EsSGg5CMM,3032
+adam/commands/postgres/postgres.py,sha256=TiJwXGa4faPZ7DI8698SwgjnUXsIaVgG-R_-eXVPhwk,3142
 adam/commands/postgres/postgres_ls.py,sha256=HwZTgwGKXUqHX33S8aQPF6FqCrLqtoz4cLyJV2SpoE0,1186
 adam/commands/postgres/postgres_preview.py,sha256=MLzdEc4mvNj6V1Q8jO5OPznXyYELJHgd35_eQgLlNIU,1274
 adam/commands/postgres/postgres_session.py,sha256=RcqkCgtA78M-9LKTwG6pp8n9JwjmURXgf1FknIIPl9g,9305
 adam/commands/postgres/postgres_utils.py,sha256=mC5PZXrfxzqZt6n_HYASwe6Y-OyAK3QwEtDeVb_TKrA,877
+adam/commands/postgres/psql_completions.py,sha256=huEvqYTjBk_3CY_Tu1dDeUlaNwPIMLagnv9QuSWCB5U,392
+adam/commands/postgres/psql_table_completer.py,sha256=8-4flf-PEtQGOSjTdA_93ht1EoZGZ4-dAbrXtyVblS4,819
 adam/commands/reaper/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 adam/commands/reaper/reaper.py,sha256=83R0ZRitEwaYKKssfKxn3zAzLnWIP9QKd1mA6awceS8,1908
 adam/commands/reaper/reaper_forward.py,sha256=mUp409MzT91cVXGxoPfBGceaR3qZ0rVdWKGdyzPNzSA,3177
@@ -160,6 +163,11 @@ adam/k8s_utils/service_accounts.py,sha256=v2oQSqCrNvt2uRnKlNwR3fjtpUG7oF5nqgzEB7
 adam/k8s_utils/services.py,sha256=EOJJGACVbbRvu5T3rMKqIJqgYic1_MSJ17EA0TJ6UOk,3156
 adam/k8s_utils/statefulsets.py,sha256=hiBOmJZ3KTI6_naAFzNoW1NoYnnBG35BZ7RMdPhNC6o,4664
 adam/k8s_utils/volumes.py,sha256=RIBmlOSWM3V3QVXLCFT0owVOyh4rGG1ETp521a-6ndo,1137
+adam/sql/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+adam/sql/any_completer.py,sha256=hPnhqAyWIk1-gyZsna1X7AJ8po23cYR-MvYY-7iBn3w,3184
+adam/sql/sql_completer.py,sha256=9JSZj-Rv5aag720xuQLgq9WlseLtPEAcQXx6OH-pFP8,2160
+adam/sql/sql_utils.py,sha256=MLoxB9h22WZiANu0SZzmBJcY2gtb6f_D4jnoJEjLgPc,171
+adam/sql/table_name_completer.py,sha256=n_vJbsfM4XYN0tCjov1l-4skFYO3xaLcyOVcZ77mteo,519
 adam/sso/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 adam/sso/authenticator.py,sha256=BCm16L9zf5aLU47-sTCnudn2zLPwd8M2wwRminJfsqw,615
 adam/sso/authn_ad.py,sha256=fDW8UR3WWykny5Awa5dQjjBUSFzIDz4aMn-lwXoABl8,5857
@@ -170,8 +178,8 @@ adam/sso/idp.py,sha256=fvcwUw_URTgsO6ySaqTIw0zQT2qRO1IPSGhf6rPtybo,5804
 adam/sso/idp_login.py,sha256=QAtCUeDTVWliJy40RK_oac8Vgybr13xH8wzeBoxPaa8,1754
 adam/sso/idp_session.py,sha256=9BUHNRf70u4rVKrVY1HKPOEmOviXvkjam8WJxmXSKIM,1735
 adam/sso/sso_config.py,sha256=5N8WZgIJQBtHUy585XLRWKjpU87_v6QluyNK9E27D5s,2459
-kaqing-2.0.48.dist-info/METADATA,sha256=ha7O1U8FB_TzVM5vFZaDfP6pSTHUwStWwfzZ8CCkma8,132
-kaqing-2.0.48.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-kaqing-2.0.48.dist-info/entry_points.txt,sha256=SkzhuQJUWsXOzHeZ5TgQ2c3_g53UGK23zzJU_JTZOZI,39
-kaqing-2.0.48.dist-info/top_level.txt,sha256=8_2PZkwBb-xDcnc8a2rAbQeJhXKXskc7zTP7pSPa1fw,5
-kaqing-2.0.48.dist-info/RECORD,,
+kaqing-2.0.50.dist-info/METADATA,sha256=6cRmIvrJppOAGCWN23OkycCXqvwVuUh8CMOcImdjjxs,132
+kaqing-2.0.50.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+kaqing-2.0.50.dist-info/entry_points.txt,sha256=SkzhuQJUWsXOzHeZ5TgQ2c3_g53UGK23zzJU_JTZOZI,39
+kaqing-2.0.50.dist-info/top_level.txt,sha256=8_2PZkwBb-xDcnc8a2rAbQeJhXKXskc7zTP7pSPa1fw,5
+kaqing-2.0.50.dist-info/RECORD,,

adam/commands/postgres/pg_completions.py

@@ -1,17 +0,0 @@
-from adam.commands.postgres.pg_table_completer import PgTableCompleter
-
-def pg_completions(ns: str, pg_path: str):
-    table = PgTableCompleter(ns, pg_path)
-    return {
-        '\h': None,
-        '\d': None,
-        '\dt': None,
-        '\du': None,
-        'delete': {'from': table.nested({'where': {'id': {'=': {"'id'": None}}}})},
-        'insert': {'into': table.nested({'values(': None})},
-        'select': {'*': {'from': table.nested({
-            'limit': {'1': {'where': {'id': {'=': {"'id'": None}}}}},
-            'where': {'id': {'=': {"'id'": {'limit': {'1': None}}}}}
-        })}},
-        'update': table.nested({'set': {'column': {'=': None}}}),
-    }