X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=scripts%2Fprint_subtree.py;h=76ac675ce9f5086652b785d89d1c8359640c350b;hb=b2d8bf8c3a4e4a28d76c2c5bd9492095b14c0db7;hp=da5eae8c5fbdac1dc48db6a26cc20f5ce686a627;hpb=3289238688d9c3dfefccf143d21f6c406faad9e4;p=sqlconvert.git

diff --git a/scripts/print_subtree.py b/scripts/print_subtree.py
index da5eae8..76ac675 100755
--- a/scripts/print_subtree.py
+++ b/scripts/print_subtree.py
@@ -1,9 +1,10 @@
 #! /usr/bin/env python
+from __future__ import print_function
 
 import sys
 from sqlparse import parse
-from mysql2sql.process_tokens import requote_names
-from mysql2sql.print_tokens import print_tokens, print_subtree
+from mysql2sql.print_tokens import print_tokens
+from mysql2sql.process_tokens import requote_names, find_error
 
 
 def test():
@@ -13,25 +14,35 @@ def test():
         "/*! directive*/ INSERT INTO `MyTable` (`Id`, `Name`) "
         "VALUES (1, 'one')"
     ):
-        print "----------"
         for parsed in parse(query):
+            print("----------")
+            if find_error(parsed):
+                print("ERRORS IN QUERY")
             requote_names(parsed)
             print_tokens(parsed)
-            print_subtree(parsed)
-    print "----------"
+            print()
+            parsed._pprint_tree()
+    print("----------")
 
 
-def main(query):
-    parsed = parse(query)[0]
-    requote_names(parsed)
-    print_tokens(parsed)
-    print_subtree(parsed)
+def main(*queries):
+    for query in queries:
+        for parsed in parse(query):
+            print("----------")
+            if find_error(parsed):
+                print("ERRORS IN QUERY")
+            requote_names(parsed)
+            print_tokens(parsed)
+            print()
+            parsed._pprint_tree()
+        print("----------")
 
 if __name__ == '__main__':
-    if len(sys.argv) != 2:
-        sys.exit("Usage: %s [-t | sql_query_string]" % sys.argv[0])
+    if len(sys.argv) <= 1:
+        sys.exit("Usage: %s [-t | sql_query_string [; sql_query_string ...]]" %
+                 sys.argv[0])
     if sys.argv[1] == '-t':
         test()
     else:
-        query = sys.argv[1]
-        main(query)
+        queries = sys.argv[1:]
+        main(*queries)