kaqing 2.0.34__tar.gz → 2.0.35__tar.gz

{kaqing-2.0.34 → kaqing-2.0.35}/PKG-INFO

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

{kaqing-2.0.34 → kaqing-2.0.35}/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

{kaqing-2.0.34 → kaqing-2.0.35}/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,14 @@ class Postgres(Command):
         else:
             return {}
 
+    @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'
 

{kaqing-2.0.34 → kaqing-2.0.35}/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
 

kaqing-2.0.35/adam/version.py

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

{kaqing-2.0.34 → kaqing-2.0.35}/kaqing.egg-info/PKG-INFO

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

{kaqing-2.0.34 → kaqing-2.0.35}/setup.py

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

kaqing-2.0.34/adam/version.py

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