summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAmjith Ramanujam <amjith.r@gmail.com>2015-06-20 23:41:55 -0700
committerAmjith Ramanujam <amjith.r@gmail.com>2015-06-20 23:41:55 -0700
commit72d435338209917e2e9f6624af6591f995644b98 (patch)
treeaf29df0fc3b249c373890a6ef5b0bdc5dd842273
parent44528026d292737641ce8011b5096ade8f87a9a6 (diff)
parentf07eae1018f183df671d0f04459d497aec5cee17 (diff)
Merge pull request #260 from brettatoms/autocomplete-namedqueries
add autocompletion for named queries
-rw-r--r--pgcli/packages/sqlcompletion.py3
-rw-r--r--pgcli/pgcompleter.py6
2 files changed, 9 insertions, 0 deletions
diff --git a/pgcli/packages/sqlcompletion.py b/pgcli/packages/sqlcompletion.py
index 21c08189..8268c276 100644
--- a/pgcli/packages/sqlcompletion.py
+++ b/pgcli/packages/sqlcompletion.py
@@ -132,6 +132,9 @@ def suggest_special(text):
return [{'type': 'schema'},
{'type': rel_type, 'schema': []}]
+ if cmd in ['\\n', '\\ns', '\\nd']:
+ return [{'type': 'namedquery'}]
+
return [{'type': 'keyword'}, {'type': 'special'}]
diff --git a/pgcli/pgcompleter.py b/pgcli/pgcompleter.py
index 55aa958c..e61ad96d 100644
--- a/pgcli/pgcompleter.py
+++ b/pgcli/pgcompleter.py
@@ -4,6 +4,7 @@ import re
from prompt_toolkit.completion import Completer, Completion
from .packages.sqlcompletion import suggest_type
from .packages.parseutils import last_word
+from .packages.pgspecial.namedqueries import namedqueries
try:
from collections import Counter
@@ -334,6 +335,11 @@ class PGCompleter(Completer):
fuzzy=False)
completions.extend(types)
+ elif suggestion['type'] == 'namedquery':
+ queries = self.find_matches(word_before_cursor, namedqueries.list(),
+ start_only=True, fuzzy=False)
+ completions.extend(queries)
+
return completions
def populate_scoped_cols(self, scoped_tbls):