From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Fri, 31 May 2013 00:30:51 +0000 (-0400)
Subject: restore functionality here
X-Git-Tag: rel_0_8_2~65
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=81e786f50f8833b4c359acf0468958db134c1f1c;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

restore functionality here
---

diff --git a/lib/sqlalchemy/orm/query.py b/lib/sqlalchemy/orm/query.py
index cb6348f6f1..c2ec72c510 100644
--- a/lib/sqlalchemy/orm/query.py
+++ b/lib/sqlalchemy/orm/query.py
@@ -175,6 +175,7 @@ class Query(object):
                     raise sa_exc.ArgumentError(
                             "A selectable (FromClause) instance is "
                             "expected when the base alias is being set.")
+                self._select_from_entity = from_obj
                 fa.append(info.selectable)
             elif not info.is_selectable:
                 raise sa_exc.ArgumentError(