From 675f021368a375c330c07d0826e30049f2f0e016 Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Mon, 19 Dec 2016 12:39:15 -0500 Subject: Add real .entities to _BundleEntity Fixed bug where the single-table inheritance query criteria would not be inserted into the query in the case that the :class:`.Bundle` construct were used as the selection criteria. Change-Id: Ib7c128ceef5c3220a098cdfd0270c43a2a67716d Fixes: #3874 --- lib/sqlalchemy/orm/query.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'lib/sqlalchemy/orm') diff --git a/lib/sqlalchemy/orm/query.py b/lib/sqlalchemy/orm/query.py index 340e71d25..770345315 100644 --- a/lib/sqlalchemy/orm/query.py +++ b/lib/sqlalchemy/orm/query.py @@ -3802,10 +3802,15 @@ class _BundleEntity(_QueryEntity): else: _ColumnEntity(self, expr, namespace=self) - self.entities = () - self.supports_single_entity = self.bundle.single_entity + @property + def entities(self): + entities = [] + for ent in self._entities: + entities.extend(ent.entities) + return entities + @property def entity_zero(self): for ent in self._entities: -- cgit v1.2.1