diff options
Diffstat (limited to 'lib/sqlalchemy')
| -rw-r--r-- | lib/sqlalchemy/orm/util.py | 7 | ||||
| -rw-r--r-- | lib/sqlalchemy/sql/annotation.py | 17 | ||||
| -rw-r--r-- | lib/sqlalchemy/sql/selectable.py | 30 | ||||
| -rw-r--r-- | lib/sqlalchemy/sql/util.py | 4 | ||||
| -rw-r--r-- | lib/sqlalchemy/testing/fixtures.py | 12 | ||||
| -rw-r--r-- | lib/sqlalchemy/util/preloaded.py | 2 |
6 files changed, 63 insertions, 9 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__( diff --git a/lib/sqlalchemy/sql/annotation.py b/lib/sqlalchemy/sql/annotation.py index 43ca84abb..3ce524447 100644 --- a/lib/sqlalchemy/sql/annotation.py +++ b/lib/sqlalchemy/sql/annotation.py @@ -421,6 +421,7 @@ def _deep_annotate( annotations: _AnnotationDict, exclude: Optional[Sequence[SupportsAnnotations]] = None, detect_subquery_cols: bool = False, + ind_cols_on_fromclause: bool = False, ) -> _SA: """Deep copy the given ClauseElement, annotating each element with the given annotations dictionary. @@ -435,6 +436,16 @@ def _deep_annotate( cloned_ids: Dict[int, SupportsAnnotations] = {} def clone(elem: SupportsAnnotations, **kw: Any) -> SupportsAnnotations: + + # ind_cols_on_fromclause means make sure an AnnotatedFromClause + # has its own .c collection independent of that which its proxying. + # this is used specifically by orm.LoaderCriteriaOption to break + # a reference cycle that it's otherwise prone to building, + # see test_relationship_criteria-> + # test_loader_criteria_subquery_w_same_entity. logic here was + # changed for #8796 and made explicit; previously it occurred + # by accident + kw["detect_subquery_cols"] = detect_subquery_cols id_ = id(elem) @@ -454,7 +465,11 @@ def _deep_annotate( newelem = elem._annotate(annotations) else: newelem = elem - newelem._copy_internals(clone=clone) + + newelem._copy_internals( + clone=clone, ind_cols_on_fromclause=ind_cols_on_fromclause + ) + cloned_ids[id_] = newelem return newelem diff --git a/lib/sqlalchemy/sql/selectable.py b/lib/sqlalchemy/sql/selectable.py index 23260a985..08d01c883 100644 --- a/lib/sqlalchemy/sql/selectable.py +++ b/lib/sqlalchemy/sql/selectable.py @@ -6753,8 +6753,28 @@ TextAsFrom = TextualSelect class AnnotatedFromClause(Annotated): - def __init__(self, element, values): - # force FromClause to generate their internal - # collections into __dict__ - element.c - Annotated.__init__(self, element, values) + def _copy_internals(self, **kw): + super()._copy_internals(**kw) + if kw.get("ind_cols_on_fromclause", False): + ee = self._Annotated__element # type: ignore + + self.c = ee.__class__.c.fget(self) # type: ignore + + @util.ro_memoized_property + def c(self) -> ReadOnlyColumnCollection[str, KeyedColumnElement[Any]]: + """proxy the .c collection of the underlying FromClause. + + Originally implemented in 2008 as a simple load of the .c collection + when the annotated construct was created (see d3621ae961a), in modern + SQLAlchemy versions this can be expensive for statements constructed + with ORM aliases. So for #8796 SQLAlchemy 2.0 we instead proxy + it, which works just as well. + + Two different use cases seem to require the collection either copied + from the underlying one, or unique to this AnnotatedFromClause. + + See test_selectable->test_annotated_corresponding_column + + """ + ee = self._Annotated__element # type: ignore + return ee.c # type: ignore diff --git a/lib/sqlalchemy/sql/util.py b/lib/sqlalchemy/sql/util.py index 1f9944529..ec8ea757f 100644 --- a/lib/sqlalchemy/sql/util.py +++ b/lib/sqlalchemy/sql/util.py @@ -1203,7 +1203,9 @@ class ClauseAdapter(visitors.ReplacingExternalTraversal): elif self.exclude_fn and self.exclude_fn(col): return None else: - return self._corresponding_column(col, True) # type: ignore + return self._corresponding_column( # type: ignore + col, require_embedded=True + ) class _ColumnLookup(Protocol): diff --git a/lib/sqlalchemy/testing/fixtures.py b/lib/sqlalchemy/testing/fixtures.py index 5fb547cbc..dcee3f18b 100644 --- a/lib/sqlalchemy/testing/fixtures.py +++ b/lib/sqlalchemy/testing/fixtures.py @@ -27,6 +27,7 @@ from .util import drop_all_tables_from_metadata from .. import event from .. import util from ..orm import DeclarativeBase +from ..orm import events as orm_events from ..orm import MappedAsDataclass from ..orm import registry from ..schema import sort_tables_and_constraints @@ -618,6 +619,17 @@ class RemovesEvents: event.remove(*key) +class RemoveORMEventsGlobally: + @config.fixture(autouse=True) + def _remove_listeners(self): + yield + orm_events.MapperEvents._clear() + orm_events.InstanceEvents._clear() + orm_events.SessionEvents._clear() + orm_events.InstrumentationEvents._clear() + orm_events.QueryEvents._clear() + + _fixture_sessions = set() diff --git a/lib/sqlalchemy/util/preloaded.py b/lib/sqlalchemy/util/preloaded.py index 6332b3c94..ae700b77d 100644 --- a/lib/sqlalchemy/util/preloaded.py +++ b/lib/sqlalchemy/util/preloaded.py @@ -35,7 +35,7 @@ if TYPE_CHECKING: from sqlalchemy.orm import decl_base as _orm_decl_base from sqlalchemy.orm import dependency as _orm_dependency from sqlalchemy.orm import descriptor_props as _orm_descriptor_props - from sqlalchemy.orm import mapper as _orm_mapper + from sqlalchemy.orm import mapperlib as _orm_mapper from sqlalchemy.orm import properties as _orm_properties from sqlalchemy.orm import relationships as _orm_relationships from sqlalchemy.orm import session as _orm_session |