From 0e2382ea84bce6dd293aaabc10ed88ad85f31245 Mon Sep 17 00:00:00 2001
From: Ignacio Campos Rivera <icamposrivera@gmail.com>
Date: Wed, 29 Jun 2016 12:44:43 +0200
Subject: [PATCH 1/2] LIMIT clause location changed

---
 sqlparse/keywords.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sqlparse/keywords.py b/sqlparse/keywords.py
index a6ee1d67..292d4ac1 100644
--- a/sqlparse/keywords.py
+++ b/sqlparse/keywords.py
@@ -329,7 +329,6 @@ def is_keyword(value):
     'LENGTH': tokens.Keyword,
     'LESS': tokens.Keyword,
     'LEVEL': tokens.Keyword,
-    'LIMIT': tokens.Keyword,
     'LISTEN': tokens.Keyword,
     'LOAD': tokens.Keyword,
     'LOCAL': tokens.Keyword,
@@ -655,6 +654,7 @@ def is_keyword(value):
     'ALTER': tokens.Keyword.DDL,
 
     'WHERE': tokens.Keyword,
+    'LIMIT': tokens.Keyword,
     'FROM': tokens.Keyword,
     'INNER': tokens.Keyword,
     'JOIN': tokens.Keyword,

From b4a2f07cd782b636328200f5aed30b314133713b Mon Sep 17 00:00:00 2001
From: Ignacio Campos Rivera <icamposrivera@gmail.com>
Date: Wed, 29 Jun 2016 14:13:41 +0200
Subject: [PATCH 2/2] GRANULARITY and QINTERVAL clauses added. Reindentation
 deleted for AND / OR operators.

---
 sqlparse/filters/reindent.py | 5 +++--
 sqlparse/keywords.py         | 3 +++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/sqlparse/filters/reindent.py b/sqlparse/filters/reindent.py
index 68595a54..5c04e072 100644
--- 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
index 292d4ac1..125bf315 100644
--- 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,