Merge pull request andialbrecht#321 from romainr/patch-1

vmuriart · vmuriart · commit d67c442db4fd · 2017-02-07T18:53:57.000-07:00
Putting LIMIT on a new line andialbrecht#320
diff --git a/AUTHORS b/AUTHORS
@@ -32,6 +32,7 @@ Alphabetical list of contributors:
 * quest <quest@wonky.windwards.net>
 * Robert Nix <com.github@rnix.org>
 * Rocky Meza <rmeza@fusionbox.com>
+* Romain Rigaux <romain.rigaux@gmail.com>
 * Ryan Wooden <rygwdn@gmail.com>
 * saaj <id@saaj.me>
 * Shen Longxing <shenlongxing2012@gmail.com>
diff --git a/sqlparse/filters/reindent.py b/sqlparse/filters/reindent.py
@@ -51,7 +51,7 @@ def nl(self, offset=0):
     def _next_token(self, tlist, idx=-1):
         split_words = ('FROM', 'STRAIGHT_JOIN$', 'JOIN$', 'AND', 'OR',
                        'GROUP', 'ORDER', 'UNION', 'VALUES',
-                       'SET', 'BETWEEN', 'EXCEPT', 'HAVING')
+                       'SET', 'BETWEEN', 'EXCEPT', 'HAVING', 'LIMIT')
         m_split = T.Keyword, split_words, True
         tidx, token = tlist.token_next_by(m=m_split, idx=idx)
 
diff --git a/tests/test_regressions.py b/tests/test_regressions.py
@@ -43,13 +43,14 @@ def test_issue34(value):
 
 
 def test_issue35():
-    # missing space before LIMIT
+    # missing space before LIMIT. Updated for #321
     sql = sqlparse.format("select * from foo where bar = 1 limit 1",
                           reindent=True)
     assert sql == "\n".join([
         "select *",
         "from foo",
-        "where bar = 1 limit 1"])
+        "where bar = 1",
+        "limit 1"])
 
 
 def test_issue38():

-Original file line number
+Diff line change
 * quest <[email protected]>
 * Robert Nix <[email protected]>
 * Rocky Meza <[email protected]>
 +* Romain Rigaux <[email protected]>
 * Ryan Wooden <[email protected]>
 * saaj <[email protected]>
 * Shen Longxing <[email protected]>