summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/sql/compiler.py
diff options
context:
space:
mode:
authorBY-jk <BY-jk@users.noreply.github.com>2014-06-02 10:18:29 +0200
committerMike Bayer <mike_mp@zzzcomputing.com>2014-06-08 17:57:18 -0400
commit8b105cd5e401d966fdb7e0ea43942a88f02b6e66 (patch)
treeda44f3a8823ff4ce771b8c806485199ce1ab6436 /lib/sqlalchemy/sql/compiler.py
parent15bfeb48cb5112056513f1e255a8c7583a31bb56 (diff)
downloadsqlalchemy-8b105cd5e401d966fdb7e0ea43942a88f02b6e66.tar.gz
Update compiler.py
Moved initialization into else block Conflicts: lib/sqlalchemy/sql/compiler.py
Diffstat (limited to 'lib/sqlalchemy/sql/compiler.py')
-rw-r--r--lib/sqlalchemy/sql/compiler.py3
1 files changed, 2 insertions, 1 deletions
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: