summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/ext/sqlsoup.py
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2006-11-25 21:32:26 +0000
committerMike Bayer <mike_mp@zzzcomputing.com>2006-11-25 21:32:26 +0000
commit19fcb943c431c61024ff7548bfff96f0f4d8c67a (patch)
treeba84267c810efd6bf9eea4a8ee793ab694f4dfcf /lib/sqlalchemy/ext/sqlsoup.py
parentbf86de347d152a0558c80a6dac545ecf140bdcee (diff)
downloadsqlalchemy-19fcb943c431c61024ff7548bfff96f0f4d8c67a.tar.gz
- cleanup on some instance vars in Select (is_scalar, is_subquery, _froms is __froms, removed unused 'nowait', '_text', etc)
- cleaned up __repr__ on Column, AbstractTypeEngine - added standalone intersect(_all), except(_all) functions, unit tests illustrating nesting patterns [ticket:247]
Diffstat (limited to 'lib/sqlalchemy/ext/sqlsoup.py')
-rw-r--r--lib/sqlalchemy/ext/sqlsoup.py4
1 files changed, 1 insertions, 3 deletions
diff --git a/lib/sqlalchemy/ext/sqlsoup.py b/lib/sqlalchemy/ext/sqlsoup.py
index d83ecfb59..d3081bc23 100644
--- a/lib/sqlalchemy/ext/sqlsoup.py
+++ b/lib/sqlalchemy/ext/sqlsoup.py
@@ -324,9 +324,7 @@ def _selectable_name(selectable):
if isinstance(selectable, sql.Alias):
return _selectable_name(selectable.selectable)
elif isinstance(selectable, sql.Select):
- # sometimes a Select has itself in _froms
- nonrecursive_froms = [s for s in selectable._froms if s is not selectable]
- return ''.join([_selectable_name(s) for s in nonrecursive_froms])
+ return ''.join([_selectable_name(s) for s in selectable.froms])
elif isinstance(selectable, schema.Table):
return selectable.name.capitalize()
else: