kaqing 2.0.45__tar.gz → 2.0.47__tar.gz

{kaqing-2.0.45 → kaqing-2.0.47}/PKG-INFO

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

{kaqing-2.0.45 → kaqing-2.0.47}/adam/commands/postgres/pg_completions.py

@@ -7,18 +7,11 @@ 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({
-            'limit': {'1': None},
-            'where': {'id': {'=': None}}
+            'limit': {'1': {'where': {'id': {'=': {"'id'": None}}}}},
+            'where': {'id': {'=': {"'id'": {'limit': {'1': None}}}}}
         })}},
         'update': table.nested({'set': None}),
     }

{kaqing-2.0.45 → kaqing-2.0.47}/adam/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

{kaqing-2.0.45 → kaqing-2.0.47}/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}}

kaqing-2.0.47/adam/version.py

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

{kaqing-2.0.45 → kaqing-2.0.47}/kaqing.egg-info/PKG-INFO

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

{kaqing-2.0.45 → kaqing-2.0.47}/setup.py

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

kaqing-2.0.45/adam/version.py

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