Fix parsing of UNION ALL after WHERE (fixes andialbrecht#349).

andialbrecht · andialbrecht · commit 113897280c61 · 2017-07-29T10:16:34.000+02:00
diff --git a/CHANGELOG b/CHANGELOG
@@ -9,6 +9,8 @@ Bug Fixes
 
 * Fix parsing of MySQL table names starting with digits (issue337).
 * Fix detection of identifiers using comparisons (issue327).
+* Fix parsing of UNION ALL after WHERE (issue349).
+
 
 
 Release 0.2.3 (Mar 02, 2017)
diff --git a/sqlparse/sql.py b/sqlparse/sql.py
@@ -526,8 +526,9 @@ def is_multiline(self):
 class Where(TokenList):
     """A WHERE clause."""
     M_OPEN = T.Keyword, 'WHERE'
-    M_CLOSE = T.Keyword, ('ORDER', 'GROUP', 'LIMIT', 'UNION', 'EXCEPT',
-                          'HAVING', 'RETURNING', 'INTO')
+    M_CLOSE = T.Keyword, (
+        'ORDER', 'GROUP', 'LIMIT', 'UNION', 'UNION ALL', 'EXCEPT',
+        'HAVING', 'RETURNING', 'INTO')
 
 
 class Case(TokenList):
diff --git a/tests/test_grouping.py b/tests/test_grouping.py
@@ -216,6 +216,15 @@ def test_grouping_where():
     assert isinstance(p.tokens[-1].tokens[0].tokens[-2], sql.Where)
 
 
+@pytest.mark.parametrize('s', (
+    'select 1 where 1 = 2 union select 2',
+    'select 1 where 1 = 2 union all select 2',
+))
+def test_grouping_where_union(s):
+    p = sqlparse.parse(s)[0]
+    assert p.tokens[5].value.startswith('union')
+
+
 def test_returning_kw_ends_where_clause():
     s = 'delete from foo where x > y returning z'
     p = sqlparse.parse(s)[0]
