From ee2cbfea194fac4f2bbfe526fe2c3bdb856aed0b Mon Sep 17 00:00:00 2001
From: Andi Albrecht <albrecht.andi@gmail.com>
Date: Mon, 26 Sep 2016 13:03:42 +0200
Subject: Fix parsing of UNION ALL (fixes #294).

---
 CHANGELOG              | 1 +
 sqlparse/keywords.py   | 1 +
 tests/test_tokenize.py | 6 ++++++
 3 files changed, 8 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index e3264ec..a3a223b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -10,6 +10,7 @@ Bug Fixes
 
 * Fix parsing of incomplete AS (issue284, by vmuriart).
 * Fix parsing of Oracle names containing dollars (issue291).
+* Fix parsing of UNION ALL (issue294).
 
 Internal Changes
 
diff --git a/sqlparse/keywords.py b/sqlparse/keywords.py
index 3336831..48d37f0 100644
--- a/sqlparse/keywords.py
+++ b/sqlparse/keywords.py
@@ -73,6 +73,7 @@ SQL_REGEX = {
          r'|(CROSS\s+|NATURAL\s+)?)?JOIN\b', tokens.Keyword),
         (r'END(\s+IF|\s+LOOP|\s+WHILE)?\b', tokens.Keyword),
         (r'NOT\s+NULL\b', tokens.Keyword),
+        (r'UNION\s+ALL\b', tokens.Keyword),
         (r'CREATE(\s+OR\s+REPLACE)?\b', tokens.Keyword.DDL),
         (r'DOUBLE\s+PRECISION\b', tokens.Name.Builtin),
 
diff --git a/tests/test_tokenize.py b/tests/test_tokenize.py
index 22cb90f..b548541 100644
--- a/tests/test_tokenize.py
+++ b/tests/test_tokenize.py
@@ -157,6 +157,12 @@ def test_parse_join(expr):
     assert p.tokens[0].ttype is T.Keyword
 
 
+def test_parse_union():  # issue294
+    p = sqlparse.parse('UNION ALL')[0]
+    assert len(p.tokens) == 1
+    assert p.tokens[0].ttype is T.Keyword
+
+
 @pytest.mark.parametrize('s', ['END IF', 'END   IF', 'END\t\nIF',
                                'END LOOP', 'END   LOOP', 'END\t\nLOOP'])
 def test_parse_endifloop(s):
-- 
cgit v1.2.1