From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Mon, 30 Apr 2007 13:59:39 +0000 (+0000)
Subject:  - small fix to SelectResultsExt to not bypass itself during
X-Git-Tag: rel_0_3_8~69
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6cd83d10b15b1d88748eff6829014aea10c3a0b3;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

 - small fix to SelectResultsExt to not bypass itself during
      select().
---

diff --git a/CHANGES b/CHANGES
index c07e53916c..fce91bcb6a 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+-extensions
+    - small fix to SelectResultsExt to not bypass itself during
+      select().
+
 0.3.7
 - engines
     - warnings module used for issuing warnings (instead of logging)
diff --git a/lib/sqlalchemy/ext/selectresults.py b/lib/sqlalchemy/ext/selectresults.py
index ec3ad80261..68538f3cb4 100644
--- a/lib/sqlalchemy/ext/selectresults.py
+++ b/lib/sqlalchemy/ext/selectresults.py
@@ -7,7 +7,7 @@ class SelectResultsExt(orm.MapperExtension):
     def select_by(self, query, *args, **params):
         return SelectResults(query, query.join_by(*args, **params))
     def select(self, query, arg=None, **kwargs):
-        if hasattr(arg, '_selectable'):
+        if isinstance(arg, sql.FromClause) and arg.supports_execution():
             return orm.EXT_PASS
         else:
             return SelectResults(query, arg, ops=kwargs)