diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2017-09-04 12:11:19 -0400 |
|---|---|---|
| committer | mike bayer <mike_mp@zzzcomputing.com> | 2017-09-04 19:37:34 -0400 |
| commit | 1e21f9c4f8984b9d0c228e49cb3fa1b03c667c25 (patch) | |
| tree | 4f3cb2811cdb2334061e6ec0d4eaf2537d75be1a /doc | |
| parent | 65680b2343ef421a62582e23e2b35293732933ad (diff) | |
| download | sqlalchemy-1e21f9c4f8984b9d0c228e49cb3fa1b03c667c25.tar.gz | |
Guard against KeyError in session.merge after check for identity
Fixed bug in :meth:`.Session.merge` following along similar lines as that
of :ticket:`4030`, where an internal check for a target object in
the identity map could lead to an error if it were to be garbage collected
immediately before the merge routine actually retrieves the object.
Change-Id: Ifecfb8b9d50c52d0ebd5a03e1bd69fe3abf1dc40
Fixes: #4069
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/build/changelog/unreleased_11/4069.rst | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/doc/build/changelog/unreleased_11/4069.rst b/doc/build/changelog/unreleased_11/4069.rst new file mode 100644 index 000000000..f14ec9741 --- /dev/null +++ b/doc/build/changelog/unreleased_11/4069.rst @@ -0,0 +1,9 @@ +.. change:: + :tags: bug, orm + :tickets: 4069 + :versions: 1.2.0b3 + + Fixed bug in :meth:`.Session.merge` following along similar lines as that + of :ticket:`4030`, where an internal check for a target object in + the identity map could lead to an error if it were to be garbage collected + immediately before the merge routine actually retrieves the object.
\ No newline at end of file |