-from sqlparse.sql import Statement
+from sqlparse import parse
+from sqlparse.compat import PY3
from sqlparse.tokens import Name, Error, Punctuation, Comment, Newline, \
Whitespace
return False
+if PY3:
+ xrange = range
+
+
class StatementGrouper(object):
- def __init__(self):
- self.tokens = []
+ """Collect lines and reparse until the last statement is complete"""
+
+ def __init__(self, encoding=None):
+ self.lines = []
self.statements = []
+ self.encoding = encoding
+
+ def process_line(self, line):
+ self.lines.append(line)
+ self.process_lines()
+
+ def process_lines(self):
+ statements = parse(''.join(self.lines), encoding=self.encoding)
+ 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 statement in self.statements:
- yield statement
+ for stmt in self.statements:
+ yield stmt
self.statements = []
- def process(self, tokens):
- for token in tokens:
- self.tokens.append(token)
- if (token.ttype == Punctuation) and (token.value == ';'):
- self.statements.append(Statement(self.tokens))
- self.tokens = []
-
def close(self):
- for token in self.tokens:
+ if not self.lines:
+ return
+ tokens = parse(''.join(self.lines), encoding=self.encoding)
+ for token in tokens:
if (token.ttype not in (Comment.Single, Comment.Multiline,
Newline, Whitespace)):
- raise ValueError("Incomplete SQL statement: %s" % self.tokens)
- return self.tokens
+ raise ValueError("Incomplete SQL statement: %s" %
+ tokens)
+ return tokens