Added compact filter and tests

2 files changed, 45 insertions, 6 deletions

diff --git a/sqlparse/filters.py b/sqlparse/filters.py
index 291a613..cc6145a 100644
--- a/sqlparse/filters.py
+++ b/sqlparse/filters.py
@@ -4,11 +4,13 @@ import re
 
 from os.path import abspath, join
 
-from sqlparse import sql
-from sqlparse import tokens as T
-from sqlparse.engine import FilterStack
-from sqlparse.tokens import (Comment, Comparison, Keyword, Name, Punctuation,
-                             String, Whitespace)
+from sqlparse          import sql
+from sqlparse          import tokens as T
+from sqlparse.engine   import FilterStack
+from sqlparse.lexer    import tokenize
+from sqlparse.pipeline import Pipeline
+from sqlparse.tokens   import (Comment, Comparison, Keyword, Name, Punctuation,
+                               String, Whitespace)
 
 
 # --------------------------
@@ -624,3 +626,15 @@ class Limit:
                 return stream[4 - index][1]
 
         return -1
+
+
+def Compact(sql, includePath="sql"):
+    """Function that return a compacted version of the input SQL query"""
+    pipe = Pipeline()
+
+    pipe.append(tokenize)
+    pipe.append(IncludeStatement(includePath))
+    pipe.append(StripComments())
+    pipe.append(StripWhitespace)
+
+    return pipe(sql)
diff --git a/tests/test_functions.py b/tests/test_functions.py
index 73865a2..f522b35 100644
--- a/tests/test_functions.py
+++ b/tests/test_functions.py
@@ -5,11 +5,13 @@ Created on 13/02/2012
 '''
 from unittest import main, TestCase
 
-from sqlparse.lexer import tokenize
+from sqlparse.filters import Tokens2Unicode
+from sqlparse.lexer   import tokenize
 
 import sys
 sys.path.insert(0, '..')
 
+from sqlparse.filters   import Compact
 from sqlparse.functions import GetColumns, GetLimit, IsType
 
 
@@ -59,6 +61,29 @@ GROUP BY dir_entries.inode
 LIMIT 1"""
 
 
+class Test_Compact(Test_SQL):
+    def test_compact1(self):
+        self.assertEqual(Tokens2Unicode(Compact(self.sql, 'tests/files')),
+            'INSERT INTO dir_entries(type)VALUES(:type);INSERT INTO '
+            'directories(inode)VALUES(:inode)LIMIT 1')
+
+    def test_compact2(self):
+        self.assertEqual(Tokens2Unicode(Compact(self.sql2)),
+            'SELECT child_entry,asdf AS inode,creation FROM links WHERE '
+            'parent_dir==:parent_dir AND name==:name LIMIT 1')
+
+    def test_compact3(self):
+        self.assertEqual(Tokens2Unicode(Compact(self.sql3)),
+            'SELECT 0 AS st_dev,0 AS st_uid,0 AS st_gid,dir_entries.type AS '
+            'st_mode,dir_entries.inode AS st_ino,COUNT(links.child_entry)AS '
+            'st_nlink,:creation AS st_ctime,dir_entries.access AS st_atime,'
+            'dir_entries.modification AS st_mtime,COALESCE(files.size,0)AS '
+            'st_size,COALESCE(files.size,0)AS size FROM dir_entries LEFT JOIN'
+            ' files ON dir_entries.inode==files.inode LEFT JOIN links ON '
+            'dir_entries.inode==links.child_entry WHERE dir_entries.inode=='
+            ':inode GROUP BY dir_entries.inode LIMIT 1')
+
+
 class Test_GetColumns(Test_SQL):
     def test_getcolumns1(self):
         columns = GetColumns(tokenize(self.sql))