diff options
| author | Étienne BERSAC <etienne.bersac@dalibo.com> | 2017-04-27 19:51:28 +0200 |
|---|---|---|
| committer | Étienne BERSAC <etienne.bersac@dalibo.com> | 2017-04-27 21:32:44 +0200 |
| commit | 219b4a52d950255010b072634a9102b49982dc09 (patch) | |
| tree | e8acfeffb8821c31dcad700125d826a34177eb51 | |
| parent | 293b6b3a412255cc2c12f0fe94d41760d4f47d8e (diff) | |
Fix PEP8 for #693
| -rw-r--r-- | pgcli/packages/pgliterals/main.py | 4 | ||||
| -rw-r--r-- | tests/test_sqlcompletion.py | 12 |
2 files changed, 10 insertions, 6 deletions
diff --git a/pgcli/packages/pgliterals/main.py b/pgcli/packages/pgliterals/main.py index f1bcebff..874153b4 100644 --- a/pgcli/packages/pgliterals/main.py +++ b/pgcli/packages/pgliterals/main.py @@ -9,7 +9,7 @@ with open(literal_file) as f: def get_literals(literal_type, type_=tuple): - """Where `literal_type` is one of 'keywords', 'functions', 'datatypes', - returns a tuple of literal values of that type""" + # Where `literal_type` is one of 'keywords', 'functions', 'datatypes', + # returns a tuple of literal values of that type. return type_(literals[literal_type]) diff --git a/tests/test_sqlcompletion.py b/tests/test_sqlcompletion.py index 23064459..ff369c30 100644 --- a/tests/test_sqlcompletion.py +++ b/tests/test_sqlcompletion.py @@ -4,6 +4,7 @@ from pgcli.packages.sqlcompletion import ( from pgcli.packages.parseutils.tables import TableReference import pytest + def cols_etc(table, schema=None, alias=None, is_function=False, parent=None, last_keyword=None): """Returns the expected select-clause suggestions for a single-table @@ -14,6 +15,7 @@ def cols_etc(table, schema=None, alias=None, is_function=False, parent=None, Function(schema=parent), Keyword(last_keyword)]) + def test_select_suggests_cols_with_visible_table_scope(): suggestions = suggest_type('SELECT FROM tabl', 'SELECT ') assert set(suggestions) == cols_etc('tabl', last_keyword='SELECT') @@ -34,8 +36,9 @@ def test_cte_does_not_crash(): 'SELECT * FROM "tabl" WHERE ', ]) def test_where_suggests_columns_functions_quoted_table(expression): + expected = cols_etc('tabl', alias='"tabl"', last_keyword='WHERE') suggestions = suggest_type(expression, expression) - assert set(suggestions) == cols_etc('tabl', alias='"tabl"', last_keyword='WHERE') + assert expected == set(suggestions) @pytest.mark.parametrize('expression', [ @@ -89,9 +92,9 @@ def test_lparen_suggests_cols(): def test_select_suggests_cols_and_funcs(): suggestions = suggest_type('SELECT ', 'SELECT ') assert set(suggestions) == set([ - Column(table_refs=(), qualifiable=True), - Function(schema=None), - Keyword('SELECT'), + Column(table_refs=(), qualifiable=True), + Function(schema=None), + Keyword('SELECT'), ]) @@ -715,6 +718,7 @@ def test_statements_with_cursor_after_function_body(text): suggestions = suggest_type(text, text[:text.find('; ') + 1]) assert set(suggestions) == set([Keyword(), Special()]) + @pytest.mark.parametrize('text', functions) def test_statements_with_cursor_before_function_body(text): suggestions = suggest_type(text, '') |