diff options
Diffstat (limited to 'sqlparse/__init__.py')
| -rw-r--r-- | sqlparse/__init__.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sqlparse/__init__.py b/sqlparse/__init__.py index e5f4f03..794bf57 100644 --- a/sqlparse/__init__.py +++ b/sqlparse/__init__.py @@ -35,11 +35,11 @@ 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) -def format(sql, **options): +def format(sql, encoding=None, **options): """Format *sql* according to *options*. Available options are documented in :ref:`formatting`. @@ -49,7 +49,6 @@ def format(sql, **options): :returns: The formatted SQL statement as string. """ - encoding = options.pop('encoding', None) stack = engine.FilterStack() options = formatter.validate_options(options) stack = formatter.build_filter_stack(stack, options) |