diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2020-11-16 10:15:17 -0500 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2020-11-16 10:45:07 -0500 |
| commit | 218fc83f3997dc0c152278eea0740b088074784b (patch) | |
| tree | 11d63c757b7edf00160a4043af0b8f0d9fb466cf /lib/sqlalchemy/orm/context.py | |
| parent | 44a656a24242e160d5da3b45f4f65d2b2471912a (diff) | |
| download | sqlalchemy-218fc83f3997dc0c152278eea0740b088074784b.tar.gz | |
Ensure the "orm" plugin is used unconditionally for bundles
This also introduces that the "orm" plugin may be used
when the plugin_subject is None.
Fixed regression where the :paramref:`.Bundle.single_entity` flag would
take effect for a :class:`.Bundle` even though it were not set.
Additionally, this flag is legacy as it only makes sense for the
:class:`_orm.Query` object and not 2.0 style execution. a deprecation
warning is emitted when used with new-style execution.
Fixes: #5702
Change-Id: If9f43365b9d966cb398890aeba2efa555658a7e5
Diffstat (limited to 'lib/sqlalchemy/orm/context.py')
| -rw-r--r-- | lib/sqlalchemy/orm/context.py | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/lib/sqlalchemy/orm/context.py b/lib/sqlalchemy/orm/context.py index 12759f018..cd654ed3d 100644 --- a/lib/sqlalchemy/orm/context.py +++ b/lib/sqlalchemy/orm/context.py @@ -242,7 +242,8 @@ class ORMCompileState(CompileState): except KeyError: assert False, "statement had 'orm' plugin but no plugin_subject" else: - bind_arguments["mapper"] = plugin_subject.mapper + if plugin_subject: + bind_arguments["mapper"] = plugin_subject.mapper if load_options._autoflush: session._autoflush() @@ -342,10 +343,10 @@ class ORMFromStatementCompileState(ORMCompileState): self._polymorphic_adapters = {} self._no_yield_pers = set() - _QueryEntity.to_compile_state(self, statement_container._raw_columns) - self.compile_options = statement_container._compile_options + _QueryEntity.to_compile_state(self, statement_container._raw_columns) + self.current_path = statement_container._compile_options._current_path if toplevel and statement_container._with_options: @@ -494,10 +495,10 @@ class ORMSelectCompileState(ORMCompileState, SelectState): ) self._setup_with_polymorphics() - _QueryEntity.to_compile_state(self, select_statement._raw_columns) - self.compile_options = select_statement._compile_options + _QueryEntity.to_compile_state(self, select_statement._raw_columns) + # determine label style. we can make different decisions here. # at the moment, trying to see if we can always use DISAMBIGUATE_ONLY # rather than LABEL_STYLE_NONE, and if we can use disambiguate style @@ -2365,6 +2366,14 @@ class _BundleEntity(_QueryEntity): ) self.supports_single_entity = self.bundle.single_entity + if ( + self.supports_single_entity + and not compile_state.compile_options._use_legacy_query_style + ): + util.warn_deprecated_20( + "The Bundle.single_entity flag has no effect when " + "using 2.0 style execution." + ) @property def mapper(self): |