diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2021-04-20 14:09:51 -0400 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2021-04-20 14:11:44 -0400 |
| commit | 4b9e2db51a7e40ff2c4212fe8476fe0c7ba21ca0 (patch) | |
| tree | 326cb26f0c267be96a23a20432f313b566045215 /lib/sqlalchemy/orm/strategies.py | |
| parent | 3580e6ed33451505e2462ffcb1beaf96f851b011 (diff) | |
| download | sqlalchemy-4b9e2db51a7e40ff2c4212fe8476fe0c7ba21ca0.tar.gz | |
Allow immediateload to use_get for recursive call
Altered some of the behavior repaired in :ticket:`6232` where the
``immediateload`` loader strategy no longer goes into recursive loops; the
modification is that an eager load (joinedload, selectinload, or
subqueryload) from A->bs->B which then states ``immediateload`` for a
simple manytoone B->a->A that's in the identity map will populate the B->A,
so that this attribute is back-populated when the collection of A/A.bs are
loaded. This allows the objects to be functional when detached.
Fixes: #6301
Change-Id: I8505d851802c38ad8ad4e2fab9030f7c17089e9d
Diffstat (limited to 'lib/sqlalchemy/orm/strategies.py')
| -rw-r--r-- | lib/sqlalchemy/orm/strategies.py | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/lib/sqlalchemy/orm/strategies.py b/lib/sqlalchemy/orm/strategies.py index 4936049d4..0f68a3fef 100644 --- a/lib/sqlalchemy/orm/strategies.py +++ b/lib/sqlalchemy/orm/strategies.py @@ -1237,12 +1237,16 @@ class ImmediateLoader(PostLoader): populators, ): def load_immediate(state, dict_, row): - state.get_impl(self.key).get( - state, dict_, attributes.PASSIVE_OFF | attributes.NO_RAISE - ) + state.get_impl(self.key).get(state, dict_, flags) if self._check_recursive_postload(context, path): - return + # this will not emit SQL and will only emit for a many-to-one + # "use get" load. the "_RELATED" part means it may return + # instance even if its expired, since this is a mutually-recursive + # load operation. + flags = attributes.PASSIVE_NO_FETCH_RELATED | attributes.NO_RAISE + else: + flags = attributes.PASSIVE_OFF | attributes.NO_RAISE populators["delayed"].append((self.key, load_immediate)) |
