Fix suggestions in compound join clauses

Previously, this worked correctly, suggesting columns etc. from `a`
`SELECT * FROM abc a JOIN def d ON a.`

But this suggested only keywords:
`SELECT * FROM abc a JOIN def d ON a.id = d.id AND a.`

1 files changed, 12 insertions, 6 deletions

diff --git a/tests/test_sqlcompletion.py b/tests/test_sqlcompletion.py
index 120b4979..fa0e0f35 100644
--- a/tests/test_sqlcompletion.py
+++ b/tests/test_sqlcompletion.py
@@ -355,9 +355,12 @@ def test_left_join_with_comma():
          {'type': 'schema'}])
 
 
-def test_join_alias_dot_suggests_cols1():
-    suggestions = suggest_type('SELECT * FROM abc a JOIN def d ON a.',
-            'SELECT * FROM abc a JOIN def d ON a.')
+@pytest.mark.parametrize('sql', [
+    'SELECT * FROM abc a JOIN def d ON a.',
+    'SELECT * FROM abc a JOIN def d ON a.id = d.id AND a.',
+])
+def test_join_alias_dot_suggests_cols1(sql):
+    suggestions = suggest_type(sql, sql)
     assert sorted_dicts(suggestions) == sorted_dicts([
         {'type': 'column', 'tables': [(None, 'abc', 'a')]},
         {'type': 'table', 'schema': 'a'},
@@ -365,9 +368,12 @@ def test_join_alias_dot_suggests_cols1():
         {'type': 'function', 'schema': 'a'}])
 
 
-def test_join_alias_dot_suggests_cols2():
-    suggestion = suggest_type('SELECT * FROM abc a JOIN def d ON a.',
-            'SELECT * FROM abc a JOIN def d ON a.id = d.')
+@pytest.mark.parametrize('sql', [
+    'SELECT * FROM abc a JOIN def d ON a.id = d.',
+    'SELECT * FROM abc a JOIN def d ON a.id = d.id AND a.id2 = d.',
+])
+def test_join_alias_dot_suggests_cols2(sql):
+    suggestion = suggest_type(sql, sql)
     assert sorted_dicts(suggestion) == sorted_dicts([
         {'type': 'column', 'tables': [(None, 'def', 'd')]},
         {'type': 'table', 'schema': 'd'},