diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2015-12-14 17:24:47 -0500 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2015-12-14 17:30:21 -0500 |
| commit | 0e4c4d7efc08d04c3c0ae960428b08ada37e4a91 (patch) | |
| tree | 4421c6681b9bc6025c5baccffbe5d61b901c48da /lib/sqlalchemy/sql/crud.py | |
| parent | 7d96ad4d535dc02a8ab1384df1db94dea2a045b5 (diff) | |
| download | sqlalchemy-0e4c4d7efc08d04c3c0ae960428b08ada37e4a91.tar.gz | |
- Fixed bug in :meth:`.Update.return_defaults` which would cause all
insert-default holding columns not otherwise included in the SET
clause (such as primary key cols) to get rendered into the RETURNING
even though this is an UPDATE.
- Major fixes to the :paramref:`.Mapper.eager_defaults` flag, this
flag would not be honored correctly in the case that multiple
UPDATE statements were to be emitted, either as part of a flush
or a bulk update operation. Additionally, RETURNING
would be emitted unnecessarily within update statements.
fixes #3609
Diffstat (limited to 'lib/sqlalchemy/sql/crud.py')
| -rw-r--r-- | lib/sqlalchemy/sql/crud.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/sqlalchemy/sql/crud.py b/lib/sqlalchemy/sql/crud.py index 18b96018d..c5495ccde 100644 --- a/lib/sqlalchemy/sql/crud.py +++ b/lib/sqlalchemy/sql/crud.py @@ -493,6 +493,7 @@ def _append_param_update( else: compiler.postfetch.append(c) elif implicit_return_defaults and \ + stmt._return_defaults is not True and \ c in implicit_return_defaults: compiler.returning.append(c) |