]> git.ipfire.org Git - thirdparty/sqlalchemy/sqlalchemy.git/commitdiff
always visit returning clauses in the right order for positional paramstyle
authorPhilip Jenvey <pjenvey@underboss.org>
Tue, 18 Aug 2009 02:43:37 +0000 (02:43 +0000)
committerPhilip Jenvey <pjenvey@underboss.org>
Tue, 18 Aug 2009 02:43:37 +0000 (02:43 +0000)
sanity

lib/sqlalchemy/sql/compiler.py

index 02824a5f4033bd328d6d3e1f0a8e1fa4f6ef2382..78529ee6ddc7686fb785b126a7176531e716d4bf 100644 (file)
@@ -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)