@@ -7,7 +7,9 @@ def suggest_type(full_text, text_before_cursor):
     """Takes the full_text that is typed so far and also the text before the
     cursor to suggest completion type and scope.
 
-    Returns a tuple with a type of entity ('table', 'column' etc) and a scope.
+    Returns a tuple with a type of entity ('table', 'column' etc), a scope
+    and a flag to tell the caller to ignore the word at cursor and return all
+    matches in current scope.
     A scope for a column category will be a list of tables.
     """
 
@@ -31,19 +33,25 @@ def suggest_type(full_text, text_before_cursor):
         last_token = last_token.value if last_token else ''
 
     def is_function_word(word):
+        """
+        Checks iw we are at function call, such as MAX(, MIN(, AVG(, etc.
+        In this case, we want to return all columns.
+        :param word: word at cursor, for example MAX(
+        :return: true or false
+        """
         return word and len(word) > 1 and word[-1] == '('
 
     if is_function_word(word_before_cursor):
-        return ('columns', extract_tables(full_text))
+        return ('columns', extract_tables(full_text), True)
     elif last_token.lower() in ('set', 'by', 'distinct'):
-        return ('columns', extract_tables(full_text))
+        return ('columns', extract_tables(full_text), False)
     elif last_token.lower() in ('select', 'where', 'having'):
-        return ('columns-and-functions', extract_tables(full_text))
+        return ('columns-and-functions', extract_tables(full_text), False)
     elif last_token.lower() in ('from', 'update', 'into', 'describe'):
-        return ('tables', [])
+        return ('tables', [], False)
     elif last_token in ('d',):  # \d
-        return ('tables', [])
+        return ('tables', [], False)
     elif last_token.lower() in ('c', 'use'):  # \c
-        return ('databases', [])
+        return ('databases', [], False)
     else:
-        return ('keywords', [])
+        return ('keywords', [], False)
@@ -83,24 +83,26 @@ def get_completions(self, document, complete_event):
         if not self.smart_completion:
             return self.find_matches(word_before_cursor, self.all_completions)
 
-        category, scope = suggest_type(document.text,
+        category, scope, match_all = suggest_type(document.text,
                 document.text_before_cursor)
 
+        word_to_match = '' if match_all else word_before_cursor
+
         if category == 'columns':
             scoped_cols = []
             for table in scope:
                 scoped_cols.extend(self.columns[table])
-            return self.find_matches(word_before_cursor, scoped_cols)
+            return self.find_matches(word_to_match, scoped_cols)
         elif category == 'columns-and-functions':
             scoped_cols = []
             for table in scope:
                 scoped_cols.extend(self.columns[table])
-            return self.find_matches(word_before_cursor, scoped_cols +
+            return self.find_matches(word_to_match, scoped_cols +
                     self.functions)
         elif category == 'tables':
-            return self.find_matches(word_before_cursor, self.tables)
+            return self.find_matches(word_to_match, self.tables)
         elif category == 'databases':
-            return self.find_matches(word_before_cursor, self.databases)
+            return self.find_matches(word_to_match, self.databases)
         elif category == 'keywords':
-            return self.find_matches(word_before_cursor, self.keywords +
+            return self.find_matches(word_to_match, self.keywords +
                     self.special_commands)