+from sqlparse import parse
from sqlparse.sql import Statement
-from sqlparse.tokens import Name, Error, Punctuation
+from sqlparse.tokens import Name, Error, Punctuation, Comment, Newline, \
+ Whitespace
def requote_names(token_list):
class StatementGrouper(object):
def __init__(self):
- self.tokens = []
self.statements = []
+ self.tokens = []
+ self.lines = []
- def get_statements(self):
- for statement in self.statements:
- yield statement
- self.statements = []
+ def process_line(self, line):
+ lines = self.lines
+ lines.append(line)
+ tokens = parse('\n'.join(lines))[0]
+ self.process_tokens(tokens)
+ self.lines = []
- def process(self, tokens):
+ def process_tokens(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 get_statements(self):
+ for statement in self.statements:
+ yield statement
+ self.statements = []
+
def close(self):
- if self.tokens:
- raise ValueError("Incomplete SQL statement")
+ for token in self.tokens:
+ if (token.ttype not in (Comment.Single, Comment.Multiline,
+ Newline, Whitespace)):
+ raise ValueError("Incomplete SQL statement: %s" % self.tokens)
+ return self.tokens