Add a semicolon and a newline after directive

[sqlconvert.git] / demo / group-sql.py

diff --git a/demo/group-sql.py b/demo/group-sql.py
index 953e9e7cfc66a03304af31cdc7473ec584fd1a7f..101ab4a2a4b12c52d979808d963d7cf81fedd5bc 100755 (executable)
--- a/demo/group-sql.py
+++ b/demo/group-sql.py
@@ -2,13 +2,13 @@
 from __future__ import print_function
 
 import sys
-from mysql2sql.print_tokens import print_tokens
-from mysql2sql.process_tokens import requote_names, find_error, \
-    StatementGrouper
+from sqlconvert.print_tokens import print_tokens
+from sqlconvert.process_mysql import process_statement
+from sqlconvert.process_tokens import find_error, StatementGrouper
 
 
 def main(*queries):
-    grouper = StatementGrouper()
+    grouper = StatementGrouper(encoding='utf-8')
     for query in queries:
         grouper.process_line(query)
         if grouper.statements:
@@ -16,15 +16,15 @@ def main(*queries):
                 print("----------")
                 if find_error(statement):
                     print("ERRORS IN QUERY")
-                requote_names(statement)
-                print_tokens(statement)
+                process_statement(statement)
+                print_tokens(statement, encoding='utf-8')
                 print()
                 statement._pprint_tree()
             print("----------")
     tokens = grouper.close()
     if tokens:
         for token in tokens:
-            print_tokens(token)
+            print_tokens(token, encoding='utf-8')
             print(repr(token))