Organize engine module

3 files changed, 53 insertions, 37 deletions

diff --git a/sqlparse/engine/__init__.py b/sqlparse/engine/__init__.py
index 7f00c57..2c3599e 100644
--- a/sqlparse/engine/__init__.py
+++ b/sqlparse/engine/__init__.py
@@ -5,40 +5,12 @@
 # This module is part of python-sqlparse and is released under
 # the BSD License: http://www.opensource.org/licenses/bsd-license.php
 
-"""filter"""
-
-from sqlparse import lexer
 from sqlparse.engine import grouping
-from sqlparse.engine.filter import StatementFilter
-
-
-class FilterStack(object):
-    def __init__(self):
-        self.preprocess = []
-        self.stmtprocess = []
-        self.postprocess = []
-        self._grouping = False
-
-    def enable_grouping(self):
-        self._grouping = True
-
-    def run(self, sql, encoding=None):
-        stream = lexer.tokenize(sql, encoding)
-        # Process token stream
-        for filter_ in self.preprocess:
-            stream = filter_.process(stream)
-
-        stream = StatementFilter().process(stream)
-
-        # Output: Stream processed Statements
-        for stmt in stream:
-            if self._grouping:
-                stmt = grouping.group(stmt)
-
-            for filter_ in self.stmtprocess:
-                filter_.process(stmt)
-
-            for filter_ in self.postprocess:
-                stmt = filter_.process(stmt)
-
-            yield stmt
+from sqlparse.engine.filter_stack import FilterStack
+from sqlparse.engine.statement_splitter import StatementSplitter
+
+__all__ = [
+    'grouping',
+    'FilterStack',
+    'StatementSplitter',
+]
diff --git a/sqlparse/engine/filter_stack.py b/sqlparse/engine/filter_stack.py
new file mode 100644
index 0000000..e51c6f2
--- /dev/null
+++ b/sqlparse/engine/filter_stack.py
@@ -0,0 +1,44 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright (C) 2016 Andi Albrecht, albrecht.andi@gmail.com
+#
+# This module is part of python-sqlparse and is released under
+# the BSD License: http://www.opensource.org/licenses/bsd-license.php
+
+"""filter"""
+
+from sqlparse import lexer
+from sqlparse.engine import grouping
+from sqlparse.engine.statement_splitter import StatementSplitter
+
+
+class FilterStack(object):
+    def __init__(self):
+        self.preprocess = []
+        self.stmtprocess = []
+        self.postprocess = []
+        self._grouping = False
+
+    def enable_grouping(self):
+        self._grouping = True
+
+    def run(self, sql, encoding=None):
+        stream = lexer.tokenize(sql, encoding)
+        # Process token stream
+        for filter_ in self.preprocess:
+            stream = filter_.process(stream)
+
+        stream = StatementSplitter().process(stream)
+
+        # Output: Stream processed Statements
+        for stmt in stream:
+            if self._grouping:
+                stmt = grouping.group(stmt)
+
+            for filter_ in self.stmtprocess:
+                filter_.process(stmt)
+
+            for filter_ in self.postprocess:
+                stmt = filter_.process(stmt)
+
+            yield stmt
diff --git a/sqlparse/engine/filter.py b/sqlparse/engine/statement_splitter.py
index ea2033a..1d1d842 100644
--- a/sqlparse/engine/filter.py
+++ b/sqlparse/engine/statement_splitter.py
@@ -8,7 +8,7 @@
 from sqlparse import sql, tokens as T
 
 
-class StatementFilter(object):
+class StatementSplitter(object):
     """Filter that split stream at individual statements"""
 
     def __init__(self):