summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/orm/session.py
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2020-03-21 17:26:24 -0400
committerMike Bayer <mike_mp@zzzcomputing.com>2020-03-22 11:47:59 -0400
commitbecab22dcbe9d68b0671a9246e022c9810f7e319 (patch)
treee9dee7d56ca0509ee08ffde195eb2f0791e9f158 /lib/sqlalchemy/orm/session.py
parenta25e2e02e108551d2910171202fd91fdaeb8162c (diff)
downloadsqlalchemy-becab22dcbe9d68b0671a9246e022c9810f7e319.tar.gz
Test instance for matching class hierarchy on get_from_identity
Fixed issue where a lazyload that uses session-local "get" against a target many-to-one relationship where an object with the correct primary key is present, however it's an instance of a sibling class, does not correctly return None as is the case when the lazy loader actually emits a load for that row. Fixes: #5210 Change-Id: I89f9946cfeba61d89a272435f76a5a082b1da30c
Diffstat (limited to 'lib/sqlalchemy/orm/session.py')
-rw-r--r--lib/sqlalchemy/orm/session.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/sqlalchemy/orm/session.py b/lib/sqlalchemy/orm/session.py
index f172649ba..fefdd4ef1 100644
--- a/lib/sqlalchemy/orm/session.py
+++ b/lib/sqlalchemy/orm/session.py
@@ -1617,7 +1617,7 @@ class Session(_SessionClassMethods):
key = mapper.identity_key_from_primary_key(
primary_key_identity, identity_token=identity_token
)
- return loading.get_from_identity(self, key, passive)
+ return loading.get_from_identity(self, mapper, key, passive)
@property
@util.contextmanager