summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/orm/util.py
diff options
context:
space:
mode:
Diffstat (limited to 'lib/sqlalchemy/orm/util.py')
-rw-r--r--lib/sqlalchemy/orm/util.py7
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__(