Merge pull request #254 from vmuriart/tests_str-format

Add various tests and change to new style str-format

2 files changed, 10 insertions, 9 deletions

diff --git a/examples/column_defs_lowlevel.py b/examples/column_defs_lowlevel.py
index 7cce753..5acbdec 100644
--- a/examples/column_defs_lowlevel.py
+++ b/examples/column_defs_lowlevel.py
@@ -49,5 +49,5 @@ def extract_definitions(token_list):
 columns = extract_definitions(par)
 
 for column in columns:
-    print('NAME: %-12s DEFINITION: %s' % (column[0],
-                                          ''.join(str(t) for t in column[1:])))
+    print('NAME: {name:10} DEFINITION: {definition}'.format(
+        name=column[0], definition=''.join(str(t) for t in column[1:])))
diff --git a/examples/extract_table_names.py b/examples/extract_table_names.py
index b43ee5f..c1bcf8b 100644
--- a/examples/extract_table_names.py
+++ b/examples/extract_table_names.py
@@ -12,11 +12,6 @@
 # See:
 # http://groups.google.com/group/sqlparse/browse_thread/thread/b0bd9a022e9d4895
 
-sql = """
-select K.a,K.b from (select H.b from (select G.c from (select F.d from
-(select E.e from A, B, C, D, E), F), G), H), I, J, K order by 1,2;
-"""
-
 import sqlparse
 from sqlparse.sql import IdentifierList, Identifier
 from sqlparse.tokens import Keyword, DML
@@ -59,10 +54,16 @@ def extract_table_identifiers(token_stream):
             yield item.value
 
 
-def extract_tables():
+def extract_tables(sql):
     stream = extract_from_part(sqlparse.parse(sql)[0])
     return list(extract_table_identifiers(stream))
 
 
 if __name__ == '__main__':
-    print('Tables: %s' % ', '.join(extract_tables()))
+    sql = """
+    select K.a,K.b from (select H.b from (select G.c from (select F.d from
+    (select E.e from A, B, C, D, E), F), G), H), I, J, K order by 1,2;
+    """
+
+    tables = ', '.join(extract_tables(sql))
+    print('Tables: {0}'.format(tables))