Collect lines and reparse until the last statement is complete

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

diff --git a/scripts/group-sql.py b/scripts/group-sql.py
index f1f09886ea6be49b31632f767bf640ed25b8b141..953e9e7cfc66a03304af31cdc7473ec584fd1a7f 100755 (executable)
--- a/scripts/group-sql.py
+++ b/scripts/group-sql.py
@@ -2,7 +2,6 @@
 from __future__ import print_function
 
 import sys
-from sqlparse import parse
 from mysql2sql.print_tokens import print_tokens
 from mysql2sql.process_tokens import requote_names, find_error, \
     StatementGrouper
@@ -11,7 +10,7 @@ from mysql2sql.process_tokens import requote_names, find_error, \
 def main(*queries):
     grouper = StatementGrouper()
     for query in queries:
-        grouper.process(parse(query)[0])
+        grouper.process_line(query)
         if grouper.statements:
             for statement in grouper.get_statements():
                 print("----------")
@@ -22,7 +21,11 @@ def main(*queries):
                 print()
                 statement._pprint_tree()
             print("----------")
-    grouper.close()
+    tokens = grouper.close()
+    if tokens:
+        for token in tokens:
+            print_tokens(token)
+            print(repr(token))
 
 
 def test():