diff options
Diffstat (limited to 'lib/sqlalchemy/orm/query.py')
-rw-r--r-- | lib/sqlalchemy/orm/query.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/sqlalchemy/orm/query.py b/lib/sqlalchemy/orm/query.py index fe1ea9bfc..0da7d08a4 100644 --- a/lib/sqlalchemy/orm/query.py +++ b/lib/sqlalchemy/orm/query.py @@ -1048,6 +1048,8 @@ class Query(Generative): if not issubclass(instance.__class__, mapper.class_): return None return instance + elif instance is attributes.PASSIVE_CLASS_MISMATCH: + return None return db_load_fn(self, primary_key_identity) |