Refactor filter-stack to simplify logic

vmuriart · vmuriart · commit 3fed0393a80a · 2016-06-04T15:06:04.000-07:00
if (self.stmtprocess or self.postprocess or
                self.split_statements or self._grouping):
always evaluates to true after removing unused features
diff --git a/sqlparse/__init__.py b/sqlparse/__init__.py
@@ -66,5 +66,4 @@ def split(sql, encoding=None):
     :returns: A list of strings.
     """
     stack = engine.FilterStack()
-    stack.split_statements = True
     return [u(stmt).strip() for stmt in stack.run(sql, encoding)]
diff --git a/sqlparse/engine/__init__.py b/sqlparse/engine/__init__.py
@@ -13,12 +13,10 @@
 
 
 class FilterStack(object):
-
     def __init__(self):
         self.preprocess = []
         self.stmtprocess = []
         self.postprocess = []
-        self.split_statements = False
         self._grouping = False
 
     def enable_grouping(self):
@@ -27,42 +25,20 @@ def enable_grouping(self):
     def run(self, sql, encoding=None):
         stream = lexer.tokenize(sql, encoding)
         # Process token stream
-        if self.preprocess:
-            for filter_ in self.preprocess:
-                stream = filter_.process(stream)
-
-        if (self.stmtprocess or self.postprocess or
-                self.split_statements or self._grouping):
-            splitter = StatementFilter()
-            stream = splitter.process(stream)
-
-        if self._grouping:
-
-            def _group(stream):
-                for stmt in stream:
-                    grouping.group(stmt)
-                    yield stmt
-            stream = _group(stream)
+        for filter_ in self.preprocess:
+            stream = filter_.process(stream)
 
-        if self.stmtprocess:
+        stream = StatementFilter().process(stream)
 
-            def _run1(stream):
-                ret = []
-                for stmt in stream:
-                    for filter_ in self.stmtprocess:
-                        filter_.process(stmt)
-                    ret.append(stmt)
-                return ret
-            stream = _run1(stream)
+        # Output: Stream processed Statements
+        for stmt in stream:
+            if self._grouping:
+                stmt = grouping.group(stmt)
 
-        if self.postprocess:
+            for filter_ in self.stmtprocess:
+                filter_.process(stmt)
 
-            def _run2(stream):
-                for stmt in stream:
-                    stmt.tokens = list(stmt.flatten())
-                    for filter_ in self.postprocess:
-                        stmt = filter_.process(stmt)
-                    yield stmt
-            stream = _run2(stream)
+            for filter_ in self.postprocess:
+                stmt = filter_.process(stmt)
 
-        return stream
+            yield stmt
diff --git a/sqlparse/engine/grouping.py b/sqlparse/engine/grouping.py
@@ -266,7 +266,7 @@ def align_comments(tlist):
         token = tlist.token_next_by(i=sql.Comment, idx=token)
 
 
-def group(tlist):
+def group(stmt):
     for func in [
         group_comments,
         group_brackets,
@@ -291,4 +291,5 @@ def group(tlist):
         group_foreach,
         group_begin,
     ]:
-        func(tlist)
+        func(stmt)
+    return stmt
