From: BY-jk <BY-jk@users.noreply.github.com>
Date: Mon, 2 Jun 2014 08:18:29 +0000 (+0200)
Subject: Update compiler.py
X-Git-Tag: rel_1_0_0b1~393
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8b105cd5e401d966fdb7e0ea43942a88f02b6e66;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

Update compiler.py

Moved initialization into else block
Conflicts:
	lib/sqlalchemy/sql/compiler.py
---

diff --git a/lib/sqlalchemy/sql/compiler.py b/lib/sqlalchemy/sql/compiler.py
index 65d0169f46..11608ef3b9 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: