summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/orm/query.py
diff options
context:
space:
mode:
Diffstat (limited to 'lib/sqlalchemy/orm/query.py')
-rw-r--r--lib/sqlalchemy/orm/query.py11
1 files changed, 10 insertions, 1 deletions
diff --git a/lib/sqlalchemy/orm/query.py b/lib/sqlalchemy/orm/query.py
index c3e5aa10d..beabc5811 100644
--- a/lib/sqlalchemy/orm/query.py
+++ b/lib/sqlalchemy/orm/query.py
@@ -3194,7 +3194,7 @@ class Bundle(object):
class _BundleEntity(_QueryEntity):
def __init__(self, query, bundle, setup_entities=True):
query._entities.append(self)
- self.bundle = self.entity_zero = bundle
+ self.bundle = bundle
self.type = type(bundle)
self._label_name = bundle.name
self._entities = []
@@ -3210,6 +3210,15 @@ class _BundleEntity(_QueryEntity):
self.filter_fn = lambda item: item
+ @property
+ def entity_zero(self):
+ for ent in self._entities:
+ ezero = ent.entity_zero
+ if ezero is not None:
+ return ezero
+ else:
+ return None
+
def corresponds_to(self, entity):
# TODO: this seems to have no effect for
# _ColumnEntity either