diff options
Diffstat (limited to 'sqlparse')
| -rw-r--r-- | sqlparse/__init__.py | 2 | ||||
| -rw-r--r-- | sqlparse/engine/__init__.py | 16 |
2 files changed, 2 insertions, 16 deletions
diff --git a/sqlparse/__init__.py b/sqlparse/__init__.py index b2494c0..794bf57 100644 --- a/sqlparse/__init__.py +++ b/sqlparse/__init__.py @@ -35,7 +35,7 @@ def parsestream(stream, encoding=None): :returns: A generator of :class:`~sqlparse.sql.Statement` instances. """ stack = engine.FilterStack() - stack.full_analyze() + stack.enable_grouping() return stack.run(stream, encoding) diff --git a/sqlparse/engine/__init__.py b/sqlparse/engine/__init__.py index 1268bd1..c6b8b0c 100644 --- a/sqlparse/engine/__init__.py +++ b/sqlparse/engine/__init__.py @@ -9,9 +9,6 @@ from sqlparse import lexer from sqlparse.engine import grouping from sqlparse.engine.filter import StatementFilter -# XXX remove this when cleanup is complete -Filter = object - class FilterStack(object): @@ -22,20 +19,9 @@ class FilterStack(object): self.split_statements = False self._grouping = False - def _flatten(self, stream): - for token in stream: - if token.is_group(): - for t in self._flatten(token.tokens): - yield t - else: - yield token - def enable_grouping(self): self._grouping = True - def full_analyze(self): - self.enable_grouping() - def run(self, sql, encoding=None): stream = lexer.tokenize(sql, encoding) # Process token stream @@ -71,7 +57,7 @@ class FilterStack(object): def _run2(stream): for stmt in stream: - stmt.tokens = list(self._flatten(stmt.tokens)) + stmt.tokens = list(stmt.flatten()) for filter_ in self.postprocess: stmt = filter_.process(self, stmt) yield stmt |