diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2017-05-12 12:01:53 -0400 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2017-05-12 15:18:45 -0400 |
| commit | 94a089bc2b425f7896659868630836c013e80dd0 (patch) | |
| tree | 572a02b8226ea0e69c19047a46915b99a0ae5e8e /lib/sqlalchemy/orm/util.py | |
| parent | 4352e220ac04d09e120c441e79b1ac12c7ca2c45 (diff) | |
| download | sqlalchemy-94a089bc2b425f7896659868630836c013e80dd0.tar.gz | |
Demote innerjoin to outerjoin coming from with_polymorphic
a with_polymorphic, regardless of inheritance type, represents
multiple classes. A subclass that wants to joinedload with innerjoin=True
needs to be demoted to an outerjoin because the parent entity rows
might not be of that type. Looks more intuitive with a joined
inheritance load, but applies just as well to single or concrete.
Change-Id: I4d3d76106ae20032269f8848aad70a8e2f9422f9
Fixes: #3988
Diffstat (limited to 'lib/sqlalchemy/orm/util.py')
| -rw-r--r-- | lib/sqlalchemy/orm/util.py | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/lib/sqlalchemy/orm/util.py b/lib/sqlalchemy/orm/util.py index 5bcb28f31..eebe18837 100644 --- a/lib/sqlalchemy/orm/util.py +++ b/lib/sqlalchemy/orm/util.py @@ -376,7 +376,8 @@ class AliasedClass(object): with_polymorphic_mappers=(), with_polymorphic_discriminator=None, base_alias=None, - use_mapper_path=False): + use_mapper_path=False, + represents_outer_join=False): mapper = _class_to_mapper(cls) if alias is None: alias = mapper._with_polymorphic_selectable.alias( @@ -395,7 +396,8 @@ class AliasedClass(object): else mapper.polymorphic_on, base_alias, use_mapper_path, - adapt_on_names + adapt_on_names, + represents_outer_join ) self.__name__ = 'AliasedClass_%s' % mapper.class_.__name__ @@ -478,7 +480,8 @@ class AliasedInsp(InspectionAttr): def __init__(self, entity, mapper, selectable, name, with_polymorphic_mappers, polymorphic_on, - _base_alias, _use_mapper_path, adapt_on_names): + _base_alias, _use_mapper_path, adapt_on_names, + represents_outer_join): self.entity = entity self.mapper = mapper self.selectable = selectable @@ -487,6 +490,7 @@ class AliasedInsp(InspectionAttr): self.polymorphic_on = polymorphic_on self._base_alias = _base_alias or self self._use_mapper_path = _use_mapper_path + self.represents_outer_join = represents_outer_join self._adapter = sql_util.ColumnAdapter( selectable, equivalents=mapper._equivalent_columns, @@ -530,7 +534,8 @@ class AliasedInsp(InspectionAttr): 'with_polymorphic_discriminator': self.polymorphic_on, 'base_alias': self._base_alias, - 'use_mapper_path': self._use_mapper_path + 'use_mapper_path': self._use_mapper_path, + 'represents_outer_join': self.represents_outer_join } def __setstate__(self, state): @@ -543,7 +548,8 @@ class AliasedInsp(InspectionAttr): state['with_polymorphic_discriminator'], state['base_alias'], state['use_mapper_path'], - state['adapt_on_names'] + state['adapt_on_names'], + state['represents_outer_join'] ) def _adapt_element(self, elem): @@ -772,7 +778,8 @@ def with_polymorphic(base, classes, selectable=False, selectable, with_polymorphic_mappers=mappers, with_polymorphic_discriminator=polymorphic_on, - use_mapper_path=_use_mapper_path) + use_mapper_path=_use_mapper_path, + represents_outer_join=not innerjoin) def _orm_annotate(element, exclude=None): |