X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=mysql2sql%2Fprocess_tokens.py;h=ddab2bf649eac2e69e67eef48e7b1edbf07b0dea;hb=0f209248832190291a510febd790e71a815e496a;hp=70dadb23bf6080b7764154e8ef3356763e552e37;hpb=5654b305081bc195027ce00302b38af1fb0e249b;p=sqlconvert.git

diff --git a/mysql2sql/process_tokens.py b/mysql2sql/process_tokens.py
index 70dadb2..ddab2bf 100644
--- a/mysql2sql/process_tokens.py
+++ b/mysql2sql/process_tokens.py
@@ -1,14 +1,13 @@
 
-from sqlparse.sql import TokenList
-from sqlparse.tokens import Name
+from sqlparse import parse
+from sqlparse.tokens import Name, Error, Punctuation, Comment, Newline, \
+    Whitespace
 
 
 def requote_names(token_list):
     """Remove backticks, quote non-lowercase identifiers"""
-    for token in token_list:
-        if isinstance(token, TokenList):
-            requote_names(token)
-        elif token.ttype is Name:
+    for token in token_list.flatten():
+        if token.ttype is Name:
             value = token.value
             if (value[0] == "`") and (value[-1] == "`"):
                 value = value[1:-1]
@@ -16,3 +15,54 @@ def requote_names(token_list):
                 token.normalized = token.value = value
             else:
                 token.normalized = token.value = '"%s"' % value
+
+
+def find_error(token_list):
+    """Find an error"""
+    for token in token_list.flatten():
+        if token.ttype is Error:
+            return True
+    return False
+
+
+class StatementGrouper(object):
+    """Collect lines and reparse until the last statement is complete"""
+
+    def __init__(self):
+        self.lines = []
+        self.statements = []
+
+    def process_line(self, line):
+        self.lines.append(line)
+        self.process_lines()
+
+    def process_lines(self):
+        statements = parse('\n'.join(self.lines))
+        last_stmt = statements[-1]
+        for i in xrange(len(last_stmt.tokens) - 1, 0, -1):
+            token = last_stmt.tokens[i]
+            if token.ttype in (Comment.Single, Comment.Multiline,
+                               Newline, Whitespace):
+                continue
+            if token.ttype is Punctuation and token.value == ';':
+                break  # The last statement is complete
+            # The last statement is still incomplete - wait for the next line
+            return
+        self.lines = []
+        self.statements = statements
+
+    def get_statements(self):
+        for stmt in self.statements:
+            yield stmt
+        self.statements = []
+
+    def close(self):
+        if not self.lines:
+            return
+        tokens = parse('\n'.join(self.lines))
+        for token in tokens:
+            if (token.ttype not in (Comment.Single, Comment.Multiline,
+                                    Newline, Whitespace)):
+                raise ValueError("Incomplete SQL statement: %s" %
+                                 tokens)
+        return tokens