- small fix to SelectResultsExt to not bypass itself during

      select().

diff --git a/CHANGES b/CHANGES
index c07e53916cbec1541302c4ffa905ab251636607a..fce91bcb6ae79fdc0df4e5213abdb0203c38479e 100644 (file)
--- 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 ec3ad80261522f9a2fd87b03d7715573318c2816..68538f3cb4e6065f6bce44f3fc5b98ff55ca3fa5 100644 (file)
--- 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)