Various changes after review

1 files changed, 17 insertions, 2 deletions

diff --git a/tests/test_sqlcompletion.py b/tests/test_sqlcompletion.py
index bce9fe7a..de95936b 100644
--- a/tests/test_sqlcompletion.py
+++ b/tests/test_sqlcompletion.py
@@ -111,9 +111,24 @@ def test_suggest_tables_views_schemas_and_functions(expression):
 
 
 @pytest.mark.parametrize('expression', [
-    'SELECT * FROM foo JOIN ',
+    'SELECT * FROM foo JOIN bar on bar.barid = foo.barid JOIN ',
+    'SELECT * FROM foo JOIN bar USING (barid) JOIN ',
 ])
-def test_suggest_tables_views_schemas_functions_and_joins(expression):
+def test_suggest_after_join_with_two_tables(expression):
+    suggestions = suggest_type(expression, expression)
+    assert set(suggestions) == set([
+        Table(schema=None),
+        View(schema=None),
+        Function(schema=None, filter='for_from_clause'),
+        Join(((None, 'foo', None, False), (None, 'bar', None, False)), None),
+        Schema(),
+    ])
+
+
+@pytest.mark.parametrize('expression', [
+    'SELECT * FROM foo JOIN '
+])
+def test_suggest_after_join_with_one_table(expression):
     suggestions = suggest_type(expression, expression)
     assert set(suggestions) == set([
         Table(schema=None),