From 6cd83d10b15b1d88748eff6829014aea10c3a0b3 Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Mon, 30 Apr 2007 13:59:39 +0000 Subject: [PATCH] - small fix to SelectResultsExt to not bypass itself during select(). --- CHANGES | 4 ++++ lib/sqlalchemy/ext/selectresults.py | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) 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) -- 2.47.2