kaqing 2.0.44__py3-none-any.whl → 2.0.46__py3-none-any.whl

adam/commands/postgres/{postgres_completions.py → pg_completions.py}

@@ -1,4 +1,4 @@
-from adam.pg_table_completer import PgTableCompleter
+from adam.commands.postgres.pg_table_completer import PgTableCompleter
 
 def pg_completions(ns: str, pg_path: str):
     table = PgTableCompleter(ns, pg_path)
@@ -7,13 +7,6 @@ def pg_completions(ns: str, pg_path: str):
         '\d': None,
         '\dt': None,
         '\du': None,
-        # 'delete': {'from': {ts: {'where': {'id': {'=': None}}}}},
-        # 'insert': {'into': {ts: {'values': None}}},
-        # 'select': {'*': {'from': {ts: {
-        #     'limit': {'1': None},
-        #     'where': {'id': {'=': None}}
-        # }}}},
-        # 'update': {ts: {'set': None}},
         'delete': {'from': table.nested({'where': {'id': {'=': None}}})},
         'insert': {'into': table.nested({'values': None})},
         'select': {'*': {'from': table.nested({

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

@@ -7,12 +7,11 @@ from adam.commands.postgres.postgres_utils import pg_table_names
 NestedDict = Mapping[str, Union[Any, Set[str], None, Completer]]
 
 class PgTableCompleter(Completer):
-    def __init__(self, namespace: str, pg_path: str, nested_dict: NestedDict = None, ignore_case: bool = True):
+    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
-        if nested_dict:
-            self.append_nested_dict(nested_dict)
+        self.append_nested_dict(nested_dict)
 
     def __repr__(self) -> str:
         return "PgTableCompleter(%r, pg_path=%r)" % (self.namespace, self.pg_path)
@@ -73,5 +72,8 @@ class PgTableCompleter(Completer):
                 for c in completer.get_completions(document, complete_event):
                     yield c
         else:
-            for t in pg_table_names(self.namespace, self.pg_path):
-                yield Completion(t)
+            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

adam/commands/postgres/postgres.py

@@ -1,7 +1,7 @@
 import click
 
 from adam.commands.command import Command
-from adam.commands.postgres.postgres_completions import pg_completions
+from adam.commands.postgres.pg_completions import pg_completions
 from adam.commands.postgres.postgres_utils import pg_table_names
 from .postgres_ls import PostgresLs
 from .postgres_preview import PostgresPreview

adam/commands/preview_table.py

@@ -2,6 +2,7 @@ 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.postgres.postgres_session import PostgresSession
 from adam.config import Config
 from adam.repl_state import ReplState, RequiredState
@@ -71,7 +72,8 @@ 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: {f'<pg_tables:{state.namespace}:{state.pg_path}>': None}}
+            return {PreviewTable.COMMAND: PgTableCompleter(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}}

adam/version.py

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

{kaqing-2.0.44.dist-info → kaqing-2.0.46.dist-info}/METADATA

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

{kaqing-2.0.44.dist-info → kaqing-2.0.46.dist-info}/RECORD

@@ -8,14 +8,13 @@ adam/config.py,sha256=5v8tf98SPnb9Mmn9EzxV1_EbjVrHo1ElkvyHpFMfbzk,2783
 adam/embedded_apps.py,sha256=lKPx63mKzJbNmwz0rgL4gF76M9fDGxraYTtNAIGnZ_s,419
 adam/embedded_params.py,sha256=_9tBKpkSzBfzm-s3tUgZs8DcSVBnPA1iumG0ZRCbZIs,4586
 adam/log.py,sha256=gg5DK52wLPc9cjykeh0WFHyAk1qI3HEpGaAK8W2dzXY,1146
-adam/pg_table_completer.py,sha256=XSG8aT04q4RH2_TqNIyP2zhApDcHH8BQq3DAYUvt5ZM,3140
 adam/pod_exec_result.py,sha256=nq0xnCNOpUGBSijGF0H-YNrwBc9vUQs4DkvLMIFS5LQ,951
 adam/repl.py,sha256=X9ga1iZFIXADQxBXvztFyVNBrfBRxiFLxTUYkm11img,7328
 adam/repl_commands.py,sha256=aH7xxbsQGrpL9Ozk9QF54iToK6wbDT3Pu9rMyw9sDBY,4719
 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=WZV5dDTmwvzrae-ufWoxplNySz6Dy2dl8OGMKbrja2k,139
+adam/version.py,sha256=ReZyuWUutOExL7Wy1NZwQJrMGphQOv8D0Kcx8cnJjbg,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
@@ -72,7 +71,7 @@ adam/commands/nodetool.py,sha256=HV9yDzMhRjS4lw6UfV7Hc1pcmeSx5a1jU6cAEKSZ1Bg,233
 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=UOquEHPg5Oj5VuzB6WVldicU0WTNqPVqEf6rPdfDB2o,2971
+adam/commands/preview_table.py,sha256=6h6GfyRIsMH1h9isV4rgMOhq704K20soqt_dM1tDdec,3136
 adam/commands/pwd.py,sha256=VlgFjxFl66I7Df1YI6cuiEeY6Q13lEavMKfrzHLESKo,2340
 adam/commands/report.py,sha256=Ky45LIzSlB_X4V12JZWjU3SA2u4_FKRencRTq7psOWU,1944
 adam/commands/restart.py,sha256=Hik1t5rjH2ATZv4tzwrGB3e44b3dNuATgY327_Nb8Bs,2044
@@ -105,8 +104,9 @@ adam/commands/medusa/medusa_restore.py,sha256=MU47bmozrjfGJ6GVkj_OVgLH6Uz_fGh03M
 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/postgres.py,sha256=5WNX4T0S_EsEC6CDCOQWXQG96jfIYQhubedpe2MrNNE,3038
-adam/commands/postgres/postgres_completions.py,sha256=dnnQ7qcw7Cev2ds03q9ydz49oaqsTvjo1GEB5cE2Lzw,857
+adam/commands/postgres/pg_completions.py,sha256=tlaumB9q0VQ8b-V06kV_qvJ_A-Dr103Zm_l05DnT8gQ,575
+adam/commands/postgres/pg_table_completer.py,sha256=fqqJYqpzWfREWHwLHdd4-Ht5YKXM5_fEwa8kw9JeWfM,3255
+adam/commands/postgres/postgres.py,sha256=cwMzevef1Vo06zNTl74T2f4Lpv5aG006M0EsSGg5CMM,3032
 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
@@ -170,8 +170,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.44.dist-info/METADATA,sha256=wcnMJLsBYC99ZwdqVVCSr8fcXXCavEvv_I-eMPGNJyw,132
-kaqing-2.0.44.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-kaqing-2.0.44.dist-info/entry_points.txt,sha256=SkzhuQJUWsXOzHeZ5TgQ2c3_g53UGK23zzJU_JTZOZI,39
-kaqing-2.0.44.dist-info/top_level.txt,sha256=8_2PZkwBb-xDcnc8a2rAbQeJhXKXskc7zTP7pSPa1fw,5
-kaqing-2.0.44.dist-info/RECORD,,
+kaqing-2.0.46.dist-info/METADATA,sha256=9bNG09_m2LuYYhKi7GGW_sr5vp9HQmp2_fyOwLLPAkU,132
+kaqing-2.0.46.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+kaqing-2.0.46.dist-info/entry_points.txt,sha256=SkzhuQJUWsXOzHeZ5TgQ2c3_g53UGK23zzJU_JTZOZI,39
+kaqing-2.0.46.dist-info/top_level.txt,sha256=8_2PZkwBb-xDcnc8a2rAbQeJhXKXskc7zTP7pSPa1fw,5
+kaqing-2.0.46.dist-info/RECORD,,