diff options
| author | Andi Albrecht <albrecht.andi@gmail.com> | 2017-09-21 10:19:57 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-21 10:19:57 +0200 |
| commit | 54551c472bdcb92679872b6bcd8348e5542fd2ee (patch) | |
| tree | 356e7c7e9c044c2d35335e0813e1d5428babe876 /sqlparse/sql.py | |
| parent | 4dd31c48c5ef42ea731e0c6a86b99cb3c89f0a6a (diff) | |
| parent | 0dd67c791e0a9fdc29cffdc9d84f811fe124726a (diff) | |
| download | sqlparse-54551c472bdcb92679872b6bcd8348e5542fd2ee.tar.gz | |
Merge branch 'master' into master
Diffstat (limited to 'sqlparse/sql.py')
| -rw-r--r-- | sqlparse/sql.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sqlparse/sql.py b/sqlparse/sql.py index f190de8..f698782 100644 --- a/sqlparse/sql.py +++ b/sqlparse/sql.py @@ -526,8 +526,9 @@ class Comment(TokenList): 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): |