diff options
| author | Jesús Leganés Combarro "Piranna" <piranna@gmail.com> | 2012-04-28 17:46:51 +0200 |
|---|---|---|
| committer | Jesús Leganés Combarro "Piranna" <piranna@gmail.com> | 2012-04-28 17:46:51 +0200 |
| commit | f64954c1bf90ecb6af314a2e61df753ef7c8fd7c (patch) | |
| tree | 07726eb4d57333883286eedf3729187bf04cfcf6 /sqlparse | |
| parent | 95ae0ac9a308df72a547911a423cc1ddadccc60e (diff) | |
| download | sqlparse-f64954c1bf90ecb6af314a2e61df753ef7c8fd7c.tar.gz | |
Finished homogeneization
Diffstat (limited to 'sqlparse')
| -rw-r--r-- | sqlparse/filters.py | 25 |
1 files changed, 19 insertions, 6 deletions
diff --git a/sqlparse/filters.py b/sqlparse/filters.py index 8f913b0..6719d6f 100644 --- a/sqlparse/filters.py +++ b/sqlparse/filters.py @@ -538,8 +538,11 @@ class OutputPythonFilter(OutputFilter): yield sql.Token(T.Operator, '(') yield sql.Token(T.Text, "'") + # Print the tokens on the quote for token in stream: + # Token is a new line separator if token.is_whitespace() and '\n' in token.value: + # Close quote and add a new line yield sql.Token(T.Text, " '") yield sql.Token(T.Whitespace, '\n') @@ -547,14 +550,18 @@ class OutputPythonFilter(OutputFilter): yield sql.Token(T.Whitespace, ' ' * (len(varname) + 4)) yield sql.Token(T.Text, "'") + # Indentation after_lb = token.value.split('\n', 1)[1] - if after_lb: # it's the indendation + if after_lb: yield sql.Token(T.Whitespace, after_lb) continue - elif token.value and "'" in token.value: + # Token has escape chars + elif "'" in token.value: token.value = token.value.replace("'", "\\'") - yield sql.Token(T.Text, token.value or '') + + # Put the token + yield sql.Token(T.Text, token.value) # Close quote yield sql.Token(T.Text, "'") @@ -577,10 +584,12 @@ class OutputPHPFilter(OutputFilter): yield sql.Token(T.Whitespace, ' ') yield sql.Token(T.Text, '"') + # Print the tokens on the quote for token in stream: + # Token is a new line separator if token.is_whitespace() and '\n' in token.value: - yield sql.Token(T.Text, ' "') - yield sql.Token(T.Operator, ';') + # Close quote and add a new line + yield sql.Token(T.Text, ' ";') yield sql.Token(T.Whitespace, '\n') # Quote header on secondary lines @@ -590,13 +599,17 @@ class OutputPHPFilter(OutputFilter): yield sql.Token(T.Whitespace, ' ') yield sql.Token(T.Text, '"') + # Indentation after_lb = token.value.split('\n', 1)[1] if after_lb: - yield sql.Token(T.Text, after_lb) + yield sql.Token(T.Whitespace, after_lb) continue + # Token has escape chars elif '"' in token.value: token.value = token.value.replace('"', '\\"') + + # Put the token yield sql.Token(T.Text, token.value) # Close quote |