From 7631460377274f6a9e074c974e2d63dafb1938eb Mon Sep 17 00:00:00 2001 From: quest Date: Sat, 21 Apr 2012 19:57:26 +0200 Subject: We can now work with file-like objects. --- sqlparse/__init__.py | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'sqlparse/__init__.py') diff --git a/sqlparse/__init__.py b/sqlparse/__init__.py index f924c04..bacaa78 100644 --- a/sqlparse/__init__.py +++ b/sqlparse/__init__.py @@ -54,6 +54,14 @@ def split(sql): stack.split_statements = True return [unicode(stmt) for stmt in stack.run(sql)] +def splitstream(sql): + """Split *sql* into single statements. + + Returns a list of strings. + """ + stack = engine.FilterStack() + stack.split_statements = True + return stack.run(sql) from sqlparse.engine.filter import StatementFilter def split2(stream): -- cgit v1.2.1 From 61f22063051fa94b0f055a995eed10b576535c29 Mon Sep 17 00:00:00 2001 From: quest Date: Sat, 21 Apr 2012 20:28:49 +0200 Subject: Minor clarifications and doc updates --- sqlparse/__init__.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'sqlparse/__init__.py') diff --git a/sqlparse/__init__.py b/sqlparse/__init__.py index bacaa78..e622292 100644 --- a/sqlparse/__init__.py +++ b/sqlparse/__init__.py @@ -54,14 +54,14 @@ def split(sql): stack.split_statements = True return [unicode(stmt) for stmt in stack.run(sql)] -def splitstream(sql): - """Split *sql* into single statements. +def splitstream(stream): + """Split sql statements from file-like object . - Returns a list of strings. + Returns a list of Statement objects. """ stack = engine.FilterStack() stack.split_statements = True - return stack.run(sql) + return stack.run(stream) from sqlparse.engine.filter import StatementFilter def split2(stream): -- cgit v1.2.1 From 1e3fbade7c80d917b4d727e9cef781b21be2fdf6 Mon Sep 17 00:00:00 2001 From: quest Date: Sat, 21 Apr 2012 22:37:30 +0200 Subject: splitstream -> parsestream --- sqlparse/__init__.py | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'sqlparse/__init__.py') 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() -- cgit v1.2.1