diff options
| -rw-r--r-- | CHANGES | 4 | ||||
| -rw-r--r-- | lib/sqlalchemy/ext/selectresults.py | 2 |
2 files changed, 5 insertions, 1 deletions
@@ -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 ec3ad8026..68538f3cb 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) |