summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkoljonen <koljonen@outlook.com>2016-06-10 03:51:52 +0200
committerkoljonen <koljonen@outlook.com>2016-06-10 03:51:52 +0200
commit351a58554b4d30e1db42a13e3cd9d533b97100b5 (patch)
treee0805071c4f286b309806ab0e2f4d4f57c76326c
parent582852adb690866e6d149ab1bcaddf88cbfb8c69 (diff)
Also exclude NATURAL JOIN from join suggestions
-rw-r--r--pgcli/packages/sqlcompletion.py2
-rw-r--r--tests/test_smart_completion_public_schema_only.py3
2 files changed, 3 insertions, 2 deletions
diff --git a/pgcli/packages/sqlcompletion.py b/pgcli/packages/sqlcompletion.py
index 81ab32cb..94c88b41 100644
--- a/pgcli/packages/sqlcompletion.py
+++ b/pgcli/packages/sqlcompletion.py
@@ -434,4 +434,4 @@ def _allow_join_suggestion(statement):
last_tok = statement.token_prev(len(statement.tokens))
return (last_tok.value.lower().endswith('join')
- and last_tok.value.lower() != 'cross join')
+ and last_tok.value.lower() not in('cross join', 'natural join'))
diff --git a/tests/test_smart_completion_public_schema_only.py b/tests/test_smart_completion_public_schema_only.py
index 1709dc46..04b605c9 100644
--- a/tests/test_smart_completion_public_schema_only.py
+++ b/tests/test_smart_completion_public_schema_only.py
@@ -455,7 +455,8 @@ def test_join_using_suggests_columns_after_first_column(completer, complete_even
@pytest.mark.parametrize('text', [
'SELECT * FROM ',
- 'SELECT * FROM users CROSS JOIN '
+ 'SELECT * FROM users CROSS JOIN ',
+ 'SELECT * FROM users natural join '
])
def test_table_names_after_from(completer, complete_event, text):
position = len(text)