diff options
| author | mike bayer <mike_mp@zzzcomputing.com> | 2022-11-16 00:01:33 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@ci3.zzzcomputing.com> | 2022-11-16 00:01:33 +0000 |
| commit | 073553be44a8be2ebff2e5893a4f1797b1e57681 (patch) | |
| tree | 36f2deee7771b693847687a3b7f1ce083f9db107 /lib/sqlalchemy/orm | |
| parent | e723db6c46aa5a24681bef349b97c287dc74de8f (diff) | |
| parent | 93dc7ea1502c37793011b094447641361aff5aba (diff) | |
| download | sqlalchemy-073553be44a8be2ebff2e5893a4f1797b1e57681.tar.gz | |
Merge "don't invoke fromclause.c when creating an annotated" into main
Diffstat (limited to 'lib/sqlalchemy/orm')
| -rw-r--r-- | lib/sqlalchemy/orm/util.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/sqlalchemy/orm/util.py b/lib/sqlalchemy/orm/util.py index 6cd98f5ea..50eba5d4c 100644 --- a/lib/sqlalchemy/orm/util.py +++ b/lib/sqlalchemy/orm/util.py @@ -1317,7 +1317,10 @@ class LoaderCriteriaOption(CriteriaOption): crit = self.where_criteria # type: ignore assert isinstance(crit, ColumnElement) return sql_util._deep_annotate( - crit, {"for_loader_criteria": self}, detect_subquery_cols=True + crit, + {"for_loader_criteria": self}, + detect_subquery_cols=True, + ind_cols_on_fromclause=True, ) def process_compile_state_replaced_entities( @@ -1416,6 +1419,8 @@ class Bundle( _propagate_attrs: _PropagateAttrsType = util.immutabledict() + proxy_set = util.EMPTY_SET # type: ignore + exprs: List[_ColumnsClauseElement] def __init__( |