wow, __len__ is a real disaster when combined with list()...turning that off

1 files changed, 31 insertions, 10 deletions

diff --git a/lib/sqlalchemy/mapping/util.py b/lib/sqlalchemy/mapping/util.py
index 74b6c7557..8e780eeef 100644
--- a/lib/sqlalchemy/mapping/util.py
+++ b/lib/sqlalchemy/mapping/util.py
@@ -1,4 +1,4 @@
-from sqlalchemy.sql import and_, select, func
+import sqlalchemy.sql as sql
 
 class SelectResults(object):
     def __init__(self, mapper, clause=None, ops={}):
@@ -10,27 +10,24 @@ class SelectResults(object):
     def count(self):
         return self._mapper.count(self._clause)
     
-    def __len__(self):
-        return self.count()
-        
     def min(self, col):
-        return select([func.min(col)], self._clause, **self._ops).scalar()
+        return sql.select([sql.func.min(col)], self._clause, **self._ops).scalar()
 
     def max(self, col):
-        return select([func.max(col)], self._clause, **self._ops).scalar()
+        return sql.select([sql.func.max(col)], self._clause, **self._ops).scalar()
 
     def sum(self, col):
-        return select([func.sum(col)], self._clause, **self._ops).scalar()
+        return sql.select([sql.func.sum(col)], self._clause, **self._ops).scalar()
 
     def avg(self, col):
-        return select([func.avg(col)], self._clause, **self._ops).scalar()
+        return sql.select([sql.func.avg(col)], self._clause, **self._ops).scalar()
 
     def clone(self):
         return SelectResults(self._mapper, self._clause, self._ops.copy())
         
     def filter(self, clause):
         new = self.clone()
-        new._clause = and_(self._clause, clause)
+        new._clause = sql.and_(self._clause, clause)
         return new
 
     def order_by(self, order_by):
@@ -70,4 +67,28 @@ class SelectResults(object):
             return list(self[item:item+1])[0]
     
     def __iter__(self):
-        return iter(self._mapper.select_whereclause(self._clause, **self._ops))
\ No newline at end of file
+        return iter(self._mapper.select_whereclause(self._clause, **self._ops))
+        
+        
+class TableFinder(sql.ClauseVisitor):
+    """given a Clause, locates all the Tables within it into a list."""
+    def __init__(self, table, check_columns=False):
+        self.tables = []
+        self.check_columns = check_columns
+        if table is not None:
+            table.accept_visitor(self)
+    def visit_table(self, table):
+        self.tables.append(table)
+    def __len__(self):
+        return len(self.tables)
+    def __getitem__(self, i):
+        return self.tables[i]
+    def __iter__(self):
+        return iter(self.tables)
+    def __contains__(self, obj):
+        return obj in self.tables
+    def __add__(self, obj):
+        return self.tables + list(obj)
+    def visit_column(self, column):
+        if self.check_columns:
+            column.table.accept_visitor(self)