Deal with long function params

soloman1124 · soloman1124 · commit 0fe6e3bac797 · 2018-03-26T09:38:57.000+10:00
diff --git a/sqlparse/filters/reindent.py b/sqlparse/filters/reindent.py
@@ -167,7 +167,9 @@ def _process_identifierlist(self, tlist):
 
             end_at = self.offset + sum(len(i.value) + 1 for i in identifiers)
             adjusted_offset = 0
-            if end_at > (self.wrap_after - self.offset) and self._last_func:
+            if (self.wrap_after > 0
+                    and end_at > (self.wrap_after - self.offset)
+                    and self._last_func):
                 adjusted_offset = -len(self._last_func.value) - 1
 
             with offset(self, adjusted_offset), indent(self):
@@ -177,7 +179,8 @@ def _process_identifierlist(self, tlist):
                 for token in identifiers:
                     # Add 1 for the "," separator
                     position += len(token.value) + 1
-                    if position > (self.wrap_after - self.offset):
+                    if (self.wrap_after > 0
+                            and position > (self.wrap_after - self.offset)):
                         adjust = 0
                         tlist.insert_before(token, self.nl(offset=adjust))
                         position = 0
diff --git a/tests/test_format.py b/tests/test_format.py
@@ -453,6 +453,18 @@ def test_identifier_list_with_functions(self):
             "       col3",
             "from my_table"])
 
+    def test_long_identifier_list_with_functions(self):
+        f = lambda sql: sqlparse.format(sql, reindent=True, wrap_after=30)
+        s = ("select 'abc' as foo, json_build_object('a',  a,"
+             "'b', b, 'c', c, 'd', d, 'e', e) as col2"
+             "col3 from my_table")
+        assert f(s) == '\n'.join([
+            "select 'abc' as foo,",
+            "       json_build_object('a',",
+            "         a, 'b', b, 'c', c, 'd', d,",
+            "         'e', e) as col2col3",
+            "from my_table"])
+
     def test_case(self):
         f = lambda sql: sqlparse.format(sql, reindent=True)
         s = 'case when foo = 1 then 2 when foo = 3 then 4 else 5 end'
