summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/orm/query.py
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2014-07-14 18:49:06 -0400
committerMike Bayer <mike_mp@zzzcomputing.com>2014-07-14 18:49:06 -0400
commitec40a84d96e43f35c54e7a9d398dc98ea7b16c50 (patch)
tree74a1b5149063e8e5f196305c48d6c820589829d5 /lib/sqlalchemy/orm/query.py
parent461993641704c8825efd44ca67542b1901af094c (diff)
downloadsqlalchemy-ec40a84d96e43f35c54e7a9d398dc98ea7b16c50.tar.gz
- Fixed a regression from 0.9.0 due to :ticket:`2736` where the
:meth:`.Query.select_from` method no longer set up the "from entity" of the :class:`.Query` object correctly, so that subsequent :meth:`.Query.filter_by` or :meth:`.Query.join` calls would fail to check the appropriate "from" entity when searching for attributes by string name. fixes #3083
Diffstat (limited to 'lib/sqlalchemy/orm/query.py')
-rw-r--r--lib/sqlalchemy/orm/query.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/sqlalchemy/orm/query.py b/lib/sqlalchemy/orm/query.py
index 751f9f84b..c340e9856 100644
--- a/lib/sqlalchemy/orm/query.py
+++ b/lib/sqlalchemy/orm/query.py
@@ -164,6 +164,7 @@ class Query(object):
if hasattr(info, 'mapper') and \
(info.is_mapper or info.is_aliased_class):
+ self._select_from_entity = from_obj
if set_base_alias:
raise sa_exc.ArgumentError(
"A selectable (FromClause) instance is "