kaqing 2.0.34__py3-none-any.whl → 2.0.36__py3-none-any.whl

adam/commands/command.py

@@ -2,6 +2,7 @@ from abc import abstractmethod
 import copy
 import subprocess
 import sys
+from typing import Callable
 
 from adam.commands.command_helpers import ClusterCommandHelper
 from adam.repl_state import ReplState, RequiredState

adam/commands/postgres/postgres.py

@@ -1,3 +1,4 @@
+import functools
 import click
 
 from adam.commands.command import Command
@@ -29,30 +30,22 @@ class Postgres(Command):
 
         state, args = self.apply_state(args, state)
 
-        if state.in_repl:
-            if not args:
+        if not args:
+            if state.in_repl:
                 log2('Please use SQL statement. e.g. pg \l')
-
-                return 'command-missing'
             else:
-                self.run_sql(state, args)
-        else:
-            if not args:
                 log2('* Command or SQL statements is missing.')
                 Command.display_help()
 
-                return 'command-missing'
-            else:
-                # head with the Chain of Responsibility pattern
-                cmds = Command.chain(Postgres.cmd_list())
-                if not cmds.run(cmd, state) :
-                    if not args:
-                        log2('* Command or SQL statements is missing.')
-                        Command.display_help()
+            return 'command-missing'
 
-                        return 'command-missing'
-                    else:
-                        self.run_sql(state, args)
+        if state.in_repl:
+            self.run_sql(state, args)
+        else:
+            # head with the Chain of Responsibility pattern
+            cmds = Command.chain(Postgres.cmd_list())
+            if not cmds.run(cmd, state) :
+                self.run_sql(state, args)
 
         return state
 
@@ -72,16 +65,21 @@ class Postgres(Command):
 
     def completion(self, state: ReplState):
         leaf = {}
-        if PostgresSession(state.namespace, state.pg_path).db:
+        session = PostgresSession(state.namespace, state.pg_path)
+        if session.db:
+            ts = self.tables(state.namespace, state.pg_path)
             leaf = {
                 '\h': None,
                 '\d': None,
                 '\dt': None,
                 '\du': None,
-                'delete': {'from': None},
-                'insert': {'into': None},
-                'select': None,
-                'update': 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},
             }
         elif state.pg_path:
             leaf = {
@@ -94,6 +92,15 @@ class Postgres(Command):
         else:
             return {}
 
+    # TODO fix cache
+    # @functools.lru_cache()
+    def tables(self, ns: str, pg_path: str):
+        session = PostgresSession(ns, pg_path)
+        if session.db:
+            return [f'{t["schema"]}.{t["name"]}' for t in session.tables()]
+
+        return []
+
     def help(self, _: ReplState):
         return f'[{Postgres.COMMAND}] <sql-statements>\t run psql with queries'
 

adam/commands/postgres/postgres_session.py

@@ -25,7 +25,7 @@ class PostgresSession:
             if len(tks) > 1:
                 self.db = tks[1]
 
-    # work for databases()
+    # works only for databases()
     def __eq__(self, other: 'PostgresSession'):
         return self.host == other.host
 

adam/version.py

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

{kaqing-2.0.34.dist-info → kaqing-2.0.36.dist-info}/METADATA

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

{kaqing-2.0.34.dist-info → kaqing-2.0.36.dist-info}/RECORD

@@ -14,7 +14,7 @@ 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=0DrCK4Qgn-81E2AOhv1X8dSDYX-GZcodTWUjebMSSKM,139
+adam/version.py,sha256=QO2Crpkw7GxhSSHxm2y2x-87sCIZ3DvMpnEXfvQbBoY,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
@@ -54,7 +54,7 @@ adam/commands/bash.py,sha256=1O9cCl9JHQdttqNAgdB44rO0NjCqHzHv4psAEQMJcjw,2714
 adam/commands/cd.py,sha256=XEoiMhbJgA2KVKwhHFcs5BRAlf9qpgbAh6IImpKOtHI,4486
 adam/commands/check.py,sha256=853FPfgTMGxQXI_5UaPAtzaSWB_BvEVm48EkJhsHe4w,2181
 adam/commands/cli_commands.py,sha256=PEEyrG9yz7RAEZwHbbuFpyE3fVi8vrIWbr0d1H0Gp9o,3620
-adam/commands/command.py,sha256=Xq5-nWLcWDq5w9nw-U78RlbwTqHeXchydBcb5rQ7Cj8,3930
+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
@@ -104,10 +104,10 @@ 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=Q63WomZGXj10q94gG9J9hN6n_ybokMWhf9jBkmtgGb8,3360
+adam/commands/postgres/postgres.py,sha256=zi6zicBLe2ZM6UCZgL3L3tdKIISEMGAh8UFcTuTUp5k,3649
 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=8Tb0dHyJv7KmAaLZbR3kV2fkX8MfnDtlzUobpNJjRys,9503
+adam/commands/postgres/postgres_session.py,sha256=CK5rkYcRHZqg2AR3fRrP81zF5P71yroPV7SvyQ6pJ7c,9509
 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
@@ -167,8 +167,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.34.dist-info/METADATA,sha256=dKclseXC1V5jp_JD65TwLgCdYNZiaObVfemki32hG6w,132
-kaqing-2.0.34.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-kaqing-2.0.34.dist-info/entry_points.txt,sha256=SkzhuQJUWsXOzHeZ5TgQ2c3_g53UGK23zzJU_JTZOZI,39
-kaqing-2.0.34.dist-info/top_level.txt,sha256=8_2PZkwBb-xDcnc8a2rAbQeJhXKXskc7zTP7pSPa1fw,5
-kaqing-2.0.34.dist-info/RECORD,,
+kaqing-2.0.36.dist-info/METADATA,sha256=QOkTjiMzYzK9hFk11nQ015VPw4umdn7pkOFfoEm0zZc,132
+kaqing-2.0.36.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+kaqing-2.0.36.dist-info/entry_points.txt,sha256=SkzhuQJUWsXOzHeZ5TgQ2c3_g53UGK23zzJU_JTZOZI,39
+kaqing-2.0.36.dist-info/top_level.txt,sha256=8_2PZkwBb-xDcnc8a2rAbQeJhXKXskc7zTP7pSPa1fw,5
+kaqing-2.0.36.dist-info/RECORD,,