Improve formatting of HAVING statements.

4 files changed, 32 insertions, 3 deletions

diff --git a/CHANGES b/CHANGES
index 5cac0f6..b7f5d7d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,7 +2,10 @@ Development Version
 -------------------
 
 Bug Fixes
-* Fix a regression in identifiers with square bracktes notation (issue153).
+* Fix a regression for identifiers with square bracktes notation (issue153).
+
+Enhancements
+* Improved formatting of HAVING statements.
 
 
 Release 0.1.14 (Nov 30, 2014)
diff --git a/sqlparse/engine/grouping.py b/sqlparse/engine/grouping.py
index ee534e3..a048128 100644
--- a/sqlparse/engine/grouping.py
+++ b/sqlparse/engine/grouping.py
@@ -301,7 +301,7 @@ def group_where(tlist):
      if not isinstance(sgroup, sql.Where)]
     idx = 0
     token = tlist.token_next_match(idx, T.Keyword, 'WHERE')
-    stopwords = ('ORDER', 'GROUP', 'LIMIT', 'UNION', 'EXCEPT')
+    stopwords = ('ORDER', 'GROUP', 'LIMIT', 'UNION', 'EXCEPT', 'HAVING')
     while token:
         tidx = tlist.token_index(token)
         end = tlist.token_next_match(tidx + 1, T.Keyword, stopwords)
diff --git a/sqlparse/filters.py b/sqlparse/filters.py
index e576a26..47972e4 100644
--- a/sqlparse/filters.py
+++ b/sqlparse/filters.py
@@ -316,7 +316,7 @@ class ReindentFilter:
     def _split_kwds(self, tlist):
         split_words = ('FROM', 'STRAIGHT_JOIN$', 'JOIN$', 'AND', 'OR',
                        'GROUP', 'ORDER', 'UNION', 'VALUES',
-                       'SET', 'BETWEEN', 'EXCEPT')
+                       'SET', 'BETWEEN', 'EXCEPT', 'HAVING')
 
         def _next_token(i):
             t = tlist.token_next_match(i, T.Keyword, split_words,
@@ -374,6 +374,17 @@ class ReindentFilter:
         self._process_default(tlist)
         self.indent -= 1
 
+    def _process_having(self, tlist):
+        token = tlist.token_next_match(0, T.Keyword, 'HAVING')
+        try:
+            tlist.insert_before(token, self.nl())
+        except ValueError:  # issue121, errors in statement
+            pass
+        self.indent += 1
+        self._process_default(tlist)
+        self.indent -= 1
+
+
     def _process_parenthesis(self, tlist):
         first = tlist.token_next(0)
         indented = False
diff --git a/tests/test_format.py b/tests/test_format.py
index b77b7a1..b789b17 100644
--- a/tests/test_format.py
+++ b/tests/test_format.py
@@ -326,3 +326,18 @@ def test_truncate_strings_invalid_option():
 def test_truncate_strings_doesnt_truncate_identifiers(sql):
     formatted = sqlparse.format(sql, truncate_strings=2)
     assert formatted == sql
+
+
+def test_having_produces_newline():
+    sql = (
+        'select * from foo, bar where bar.id = foo.bar_id'
+        ' having sum(bar.value) > 100')
+    formatted = sqlparse.format(sql, reindent=True)
+    expected = [
+        'select *',
+        'from foo,',
+        '     bar',
+        'where bar.id = foo.bar_id',
+        'having sum(bar.value) > 100'
+    ]
+    assert formatted == '\n'.join(expected)