diff options
| -rw-r--r-- | sqlparse/__init__.py | 19 | ||||
| -rw-r--r-- | tests/test_split.py | 6 |
2 files changed, 13 insertions, 12 deletions
diff --git a/sqlparse/__init__.py b/sqlparse/__init__.py index e622292..58a560c 100644 --- a/sqlparse/__init__.py +++ b/sqlparse/__init__.py @@ -31,6 +31,16 @@ def parse(sql): return tuple(stack.run(sql)) +def parsestream(stream): + """Pares sql statements from file-like object. + + Returns a generator of Statement instances. + """ + stack = engine.FilterStack() + stack.full_analyze() + return stack.run(stream) + + def format(sql, **options): """Format *sql* according to *options*. @@ -54,15 +64,6 @@ def split(sql): stack.split_statements = True return [unicode(stmt) for stmt in stack.run(sql)] -def splitstream(stream): - """Split sql statements from file-like object . - - Returns a list of Statement objects. - """ - stack = engine.FilterStack() - stack.split_statements = True - return stack.run(stream) - from sqlparse.engine.filter import StatementFilter def split2(stream): splitter = StatementFilter() diff --git a/tests/test_split.py b/tests/test_split.py index 574dd97..321fca2 100644 --- a/tests/test_split.py +++ b/tests/test_split.py @@ -121,12 +121,12 @@ class SQLSplitTest(TestCaseBase): from cStringIO import StringIO stream = StringIO("SELECT 1; SELECT 2;") - stmts = sqlparse.splitstream(stream) + stmts = sqlparse.parsestream(stream) self.assertEqual(type(stmts), types.GeneratorType) self.assertEqual(len(list(stmts)), 2) - def test_encoding_splitstream(self): + def test_encoding_parsestream(self): from cStringIO import StringIO stream = StringIO("SELECT 1; SELECT 2;") - stmts = list(sqlparse.splitstream(stream)) + stmts = list(sqlparse.parsestream(stream)) self.assertEqual(type(stmts[0].tokens[0].value), unicode) |