mirrors
/
pgcli
mirror of https://github.com/dbcli/pgcli
1
0
Fork 0
Code

Add in table specific column completion for INSERT, DELETE, UPDATE statements.

This commit is contained in:
Amjith Ramanujam 2014-12-18 22:34:17 -08:00
parent 1afc6eeec9
commit 03bf95834f
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
TODO
View File

@ -1,15 +1,11 @@
# vi: ft=vimwiki
* [o] Separate the column completions to be table specific. (SELECT, INSERT, UPDATE)
* [ ] Column completion for simple SELECT.
* [ ] Column completion for simple INSERT.
* [ ] Column completion for simple UPDATE.
* [ ] Fix: SELECT id, <tab> FROM django_migrations; - Auto-completion for the second column name is broken. Find the last keyword and use it for completion.
* [ ] Use a pager to display the output. (Check Click's document).
* [ ] Default host should not be set to localhost. Since it causes problems in IPv6 machines. Need to research this one further.
* [ ] Column completion for nested sql.
* [ ] Add JOIN to the list of keywords and provide proper autocompletion for it.
* [ ] Improve the smart completion for Insert statement. (Needs table specific columns)
* [ ] Add a few more special commands. (\l pattern, \di, \dp, \ds, \dv, \dy, \z etc)
* [ ] Write a doc about how to run it in develop mode. (pip install -e .)
* [ ] Write a doc about how to add new pgspecial commands.(psql -E)
* [ ] Improve the smart completion for Update statement. (Needs table specific columns)
* [ ] Improve the SELECT <> completion when a FROM clause is already present. (Send the whole text to sqlparse to find the table name and do column suggestions based on that.)
@ -29,6 +25,11 @@
* [ ] Create a class for the config and make it easy to access.
* [ ] Set multi-line via config file.
* [ ] New Feature List - Write the current version to config file. At launch if the version has changed, display the changelog between the two versions.
* [o] Separate the column completions to be table specific. (SELECT, INSERT, UPDATE)
* [X] Write a doc about how to run it in develop mode. (pip install -e .)
* [X] Column completion for simple SELECT.
* [X] Column completion for simple INSERT.
* [X] Column completion for simple UPDATE.
* [X] Enable multi-line mode via a keybinding.
* [X] Pressing enter should just pop another prompt.
* [X] Implement \?.

9
pgcli/packages/parseutils.py
View File

@ -51,11 +51,15 @@ def last_word(text, include_special_chars=False):
else:
return ''
# This code is borrowed from sqlparse example script.
# <url>
def is_subselect(parsed):
if not parsed.is_group():
return False
for item in parsed.tokens:
if item.ttype is DML and item.value.upper() == 'SELECT':
if item.ttype is DML and item.value.upper() in ('SELECT', 'INSERT',
'UPDATE', 'CREATE', 'DELETE'):
return True
return False
@ -70,7 +74,8 @@ def extract_from_part(parsed):
raise StopIteration
else:
yield item
elif item.ttype is Keyword and item.value.upper() == 'FROM':
elif item.ttype is Keyword and item.value.upper() in ('FROM', 'INTO',
'UPDATE', 'TABLE', ):
from_seen = True
def extract_table_identifiers(token_stream):