Merge pull request #1006 from emorozov/master

Fix autocomplete exception on quoted string.

2 files changed, 9 insertions, 0 deletions

diff --git a/mycli/packages/completion_engine.py b/mycli/packages/completion_engine.py
index c7db06c..8718204 100644
--- a/mycli/packages/completion_engine.py
+++ b/mycli/packages/completion_engine.py
@@ -129,6 +129,8 @@ def suggest_based_on_last_token(token, text_before_cursor, full_text, identifier
         prev_keyword, text_before_cursor = find_prev_keyword(text_before_cursor)
         return suggest_based_on_last_token(prev_keyword, text_before_cursor,
                                            full_text, identifier)
+    elif token is None:
+        return [{'type': 'special'}]
     else:
         token_v = token.value.lower()
 
diff --git a/test/test_completion_engine.py b/test/test_completion_engine.py
index 8b06ed3..d02124f 100644
--- a/test/test_completion_engine.py
+++ b/test/test_completion_engine.py
@@ -542,7 +542,14 @@ def test_favorite_name_suggestion(expression):
     suggestions = suggest_type(expression, expression)
     assert suggestions == [{'type': 'favoritequery'}]
 
+
 def test_order_by():
     text = 'select * from foo order by '
     suggestions = suggest_type(text, text)
     assert suggestions == [{'tables': [(None, 'foo', None)], 'type': 'column'}]
+
+
+def test_quoted_where():
+    text = "'where i=';"
+    suggestions = suggest_type(text, text)
+    assert suggestions == [{'type': 'special'}]