GRANULARITY and QINTERVAL clauses added. Reindentation deleted for AND / OR operators.

icamposrivera · icamposrivera · commit b4a2f07cd782 · 2016-06-29T14:13:41.000+02:00
diff --git a/sqlparse/filters/reindent.py b/sqlparse/filters/reindent.py
@@ -45,9 +45,10 @@ def nl(self):
         return sql.Token(T.Whitespace, self.n + self.char * self.leading_ws)
 
     def _next_token(self, tlist, idx=-1):
-        split_words = ('FROM', 'STRAIGHT_JOIN$', 'JOIN$', 'AND', 'OR',
+        split_words = ('FROM', 'STRAIGHT_JOIN$', 'JOIN$', #'AND', 'OR',
                        'GROUP', 'ORDER', 'UNION', 'VALUES',
-                       'SET', 'BETWEEN', 'EXCEPT', 'HAVING')
+                       'SET', 'BETWEEN', 'EXCEPT', 'HAVING', 'LIMIT',
+                       'GRANULARITY', 'QINTERVAL')
         m_split = T.Keyword, split_words, True
         tidx, token = tlist.token_next_by(m=m_split, idx=idx)
 
diff --git a/sqlparse/keywords.py b/sqlparse/keywords.py
@@ -275,6 +275,7 @@ def is_keyword(value):
     'GOTO': tokens.Keyword,
     'GRANT': tokens.Keyword,
     'GRANTED': tokens.Keyword,
+    'GRANULARITY': tokens.Keyword,
     'GROUPING': tokens.Keyword,
 
     'HANDLER': tokens.Keyword,
@@ -435,6 +436,8 @@ def is_keyword(value):
     'PROCEDURE': tokens.Keyword,
     'PUBLIC': tokens.Keyword,
 
+    'QINTERVAL': tokens.Keyword,
+
     'RAISE': tokens.Keyword,
     'RAW': tokens.Keyword,
     'READ': tokens.Keyword,
