diff options
| author | Jesús Leganés Combarro "Piranna" <piranna@gmail.com> | 2012-04-28 17:07:55 +0200 |
|---|---|---|
| committer | Jesús Leganés Combarro "Piranna" <piranna@gmail.com> | 2012-04-28 17:07:55 +0200 |
| commit | 95ae0ac9a308df72a547911a423cc1ddadccc60e (patch) | |
| tree | 5d0ed1620f1b3af4134d09fe2984ae1dfa212403 /sqlparse | |
| parent | 0c438d34bfe7b9b2b4984ceb09ce39416c446ccb (diff) | |
| download | sqlparse-95ae0ac9a308df72a547911a423cc1ddadccc60e.tar.gz | |
Clean-up and optimizations
Diffstat (limited to 'sqlparse')
| -rw-r--r-- | sqlparse/filters.py | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/sqlparse/filters.py b/sqlparse/filters.py index 3906bad..8f913b0 100644 --- a/sqlparse/filters.py +++ b/sqlparse/filters.py @@ -527,6 +527,7 @@ class OutputFilter(TokenFilter): class OutputPythonFilter(OutputFilter): def _process(self, stream, varname, has_nl): + # SQL query asignation to varname if self.count > 1: yield sql.Token(T.Whitespace, '\n') yield sql.Token(T.Name, varname) @@ -537,18 +538,16 @@ class OutputPythonFilter(OutputFilter): yield sql.Token(T.Operator, '(') yield sql.Token(T.Text, "'") - cnt = 0 for token in stream: - cnt += 1 if token.is_whitespace() and '\n' in token.value: - if cnt == 1: - continue - after_lb = token.value.split('\n', 1)[1] yield sql.Token(T.Text, " '") yield sql.Token(T.Whitespace, '\n') + # Quote header on secondary lines yield sql.Token(T.Whitespace, ' ' * (len(varname) + 4)) yield sql.Token(T.Text, "'") + + after_lb = token.value.split('\n', 1)[1] if after_lb: # it's the indendation yield sql.Token(T.Whitespace, after_lb) continue @@ -557,6 +556,7 @@ class OutputPythonFilter(OutputFilter): token.value = token.value.replace("'", "\\'") yield sql.Token(T.Text, token.value or '') + # Close quote yield sql.Token(T.Text, "'") if has_nl: yield sql.Token(T.Operator, ')') @@ -566,6 +566,7 @@ class OutputPHPFilter(OutputFilter): varname_prefix = '$' def _process(self, stream, varname, has_nl): + # SQL query asignation to varname (quote header) if self.count > 1: yield sql.Token(T.Whitespace, '\n') yield sql.Token(T.Name, varname) @@ -578,16 +579,18 @@ class OutputPHPFilter(OutputFilter): for token in stream: if token.is_whitespace() and '\n' in token.value: - after_lb = token.value.split('\n', 1)[1] yield sql.Token(T.Text, ' "') yield sql.Token(T.Operator, ';') yield sql.Token(T.Whitespace, '\n') + # Quote header on secondary lines yield sql.Token(T.Name, varname) yield sql.Token(T.Whitespace, ' ') yield sql.Token(T.Operator, '.=') yield sql.Token(T.Whitespace, ' ') yield sql.Token(T.Text, '"') + + after_lb = token.value.split('\n', 1)[1] if after_lb: yield sql.Token(T.Text, after_lb) continue @@ -596,6 +599,7 @@ class OutputPHPFilter(OutputFilter): token.value = token.value.replace('"', '\\"') yield sql.Token(T.Text, token.value) + # Close quote yield sql.Token(T.Text, '"') yield sql.Token(T.Punctuation, ';') |