Merge branch 'master' into milestone_0.1.5

Conflicts:
	tests/files/_Make_DirEntry.sql

1 files changed, 3 insertions, 5 deletions

diff --git a/sqlparse/filters.py b/sqlparse/filters.py
index fcd1c8d..3bf46d5 100644
--- a/sqlparse/filters.py
+++ b/sqlparse/filters.py
@@ -830,13 +830,11 @@ class Limit:
         return -1
 
 
-def Compact(sql, includePath="sql"):
-    """Function that return a compacted version of the input SQL query"""
+def compact(stream):
+    """Function that return a compacted version of the stream"""
     pipe = Pipeline()
 
-    pipe.append(tokenize)
-    pipe.append(IncludeStatement(includePath))
     pipe.append(StripComments())
     pipe.append(StripWhitespace)
 
-    return pipe(sql)
+    return pipe(stream)