From f465044d262dbbee8b5f3798822d41d79301735a Mon Sep 17 00:00:00 2001 From: Philip Jenvey Date: Tue, 18 Aug 2009 02:43:37 +0000 Subject: [PATCH] always visit returning clauses in the right order for positional paramstyle sanity --- lib/sqlalchemy/sql/compiler.py | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/lib/sqlalchemy/sql/compiler.py b/lib/sqlalchemy/sql/compiler.py index 02824a5f40..78529ee6dd 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) -- 2.47.2