From 8b105cd5e401d966fdb7e0ea43942a88f02b6e66 Mon Sep 17 00:00:00 2001 From: BY-jk Date: Mon, 2 Jun 2014 10:18:29 +0200 Subject: Update compiler.py Moved initialization into else block Conflicts: lib/sqlalchemy/sql/compiler.py --- lib/sqlalchemy/sql/compiler.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'lib/sqlalchemy/sql/compiler.py') diff --git a/lib/sqlalchemy/sql/compiler.py b/lib/sqlalchemy/sql/compiler.py index 65d0169f4..11608ef3b 100644 --- a/lib/sqlalchemy/sql/compiler.py +++ b/lib/sqlalchemy/sql/compiler.py @@ -1969,13 +1969,14 @@ class SQLCompiler(Compiled): implicit_returning = need_pks and \ self.dialect.implicit_returning and \ stmt.table.implicit_returning - if self.isinsert: implicit_return_defaults = implicit_returning and stmt._return_defaults elif self.isupdate: implicit_return_defaults = self.dialect.implicit_returning and \ stmt.table.implicit_returning and \ stmt._return_defaults + else: + implicit_return_defaults = False if implicit_return_defaults: if stmt._return_defaults is True: -- cgit v1.2.1