summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/orm
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2013-11-13 11:55:54 -0500
committerMike Bayer <mike_mp@zzzcomputing.com>2013-11-13 11:55:54 -0500
commitfefa2f5d57301f86136233a485624f0d083236d9 (patch)
tree7e504aaa52db476eb5cfe549a857902c6bd09b67 /lib/sqlalchemy/orm
parentfe1d64473896b1e8abeb8ddb966447632c057321 (diff)
downloadsqlalchemy-fefa2f5d57301f86136233a485624f0d083236d9.tar.gz
Fixed bug where usage of new :class:`.Bundle` object would cause
the :attr:`.Query.column_descriptions` attribute to fail.
Diffstat (limited to 'lib/sqlalchemy/orm')
-rw-r--r--lib/sqlalchemy/orm/query.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/sqlalchemy/orm/query.py b/lib/sqlalchemy/orm/query.py
index 1b83f3fb8..34b9691f5 100644
--- a/lib/sqlalchemy/orm/query.py
+++ b/lib/sqlalchemy/orm/query.py
@@ -3198,7 +3198,7 @@ class Bundle(object):
class _BundleEntity(_QueryEntity):
def __init__(self, query, bundle, setup_entities=True):
query._entities.append(self)
- self.bundle = bundle
+ self.bundle = self.expr = bundle
self.type = type(bundle)
self._label_name = bundle.name
self._entities = []