diff options
| author | Philip Jenvey <pjenvey@underboss.org> | 2009-08-18 02:43:37 +0000 |
|---|---|---|
| committer | Philip Jenvey <pjenvey@underboss.org> | 2009-08-18 02:43:37 +0000 |
| commit | f465044d262dbbee8b5f3798822d41d79301735a (patch) | |
| tree | 531e6d7989947fb7fd7b5666333f4be455b8d4f2 /lib/sqlalchemy/sql/compiler.py | |
| parent | da9c1405d6f62a953e6274db75cfdf30ae6eb379 (diff) | |
| download | sqlalchemy-f465044d262dbbee8b5f3798822d41d79301735a.tar.gz | |
always visit returning clauses in the right order for positional paramstyle
sanity
Diffstat (limited to 'lib/sqlalchemy/sql/compiler.py')
| -rw-r--r-- | lib/sqlalchemy/sql/compiler.py | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/lib/sqlalchemy/sql/compiler.py b/lib/sqlalchemy/sql/compiler.py index 02824a5f4..78529ee6d 100644 --- a/lib/sqlalchemy/sql/compiler.py +++ b/lib/sqlalchemy/sql/compiler.py @@ -738,16 +738,14 @@ class SQLCompiler(engine.Compiled): if update_stmt._returning: self.returning = update_stmt._returning - returning_clause = self.returning_clause(update_stmt, update_stmt._returning) - if self.returning_precedes_values: - text += " " + returning_clause + text += " " + self.returning_clause(update_stmt, update_stmt._returning) if update_stmt._whereclause: text += " WHERE " + self.process(update_stmt._whereclause) if self.returning and not self.returning_precedes_values: - text += " " + returning_clause + text += " " + self.returning_clause(update_stmt, update_stmt._returning) self.stack.pop(-1) @@ -891,16 +889,14 @@ class SQLCompiler(engine.Compiled): if delete_stmt._returning: self.returning = delete_stmt._returning - returning_clause = self.returning_clause(delete_stmt, delete_stmt._returning) - if self.returning_precedes_values: - text += " " + returning_clause + text += " " + self.returning_clause(delete_stmt, delete_stmt._returning) if delete_stmt._whereclause: text += " WHERE " + self.process(delete_stmt._whereclause) if self.returning and not self.returning_precedes_values: - text += " " + returning_clause + text += " " + self.returning_clause(delete_stmt, delete_stmt._returning) self.stack.pop(-1) |