[Sqlalchemy-commits] [1226] sqlalchemy/trunk/lib/sqlalchemy/mapping/util.py: wow, __len__ is a real
Brought to you by:
zzzeek
Menu
▾
▴
[Sqlalchemy-commits] [1226] sqlalchemy/trunk/lib/sqlalchemy/mapping/util.py: wow, __len__ is a real disaster when combined with list()...turning that off
|
From: <co...@sq...> - 2006-03-31 02:41:41
|
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> <head><style type="text/css"><!-- #msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; } #msg dt { float: left; width: 6em; font-weight: bold; } #msg dt:after { content:':';} #msg dl, #msg dt, #msg ul, #msg li { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; } #msg dl a { font-weight: bold} #msg dl a:link { color:#fc3; } #msg dl a:active { color:#ff0; } #msg dl a:visited { color:#cc6; } h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; } #msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; } #msg ul, pre { overflow: auto; } #patch { width: 100%; } #patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;} #patch .propset h4, #patch .binary h4 {margin:0;} #patch pre {padding:0;line-height:1.2em;margin:0;} #patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;} #patch .propset .diff, #patch .binary .diff {padding:10px 0;} #patch span {display:block;padding:0 10px;} #patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;} #patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;} #patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;} #patch .lines, .info {color:#888;background:#fff;} --></style> <title>[1226] sqlalchemy/trunk/lib/sqlalchemy/mapping/util.py: wow, __len__ is a real disaster when combined with list()...turning that off</title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>1226</dd> <dt>Author</dt> <dd>zzzeek</dd> <dt>Date</dt> <dd>2006-03-30 20:41:32 -0600 (Thu, 30 Mar 2006)</dd> </dl> <h3>Log Message</h3> <pre>wow, __len__ is a real disaster when combined with list()...turning that off</pre> <h3>Modified Paths</h3> <ul> <li><a href="#sqlalchemytrunklibsqlalchemymappingutilpy">sqlalchemy/trunk/lib/sqlalchemy/mapping/util.py</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="sqlalchemytrunklibsqlalchemymappingutilpy"></a> <div class="modfile"><h4>Modified: sqlalchemy/trunk/lib/sqlalchemy/mapping/util.py (1225 => 1226)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/trunk/lib/sqlalchemy/mapping/util.py 2006-03-31 02:25:59 UTC (rev 1225) +++ sqlalchemy/trunk/lib/sqlalchemy/mapping/util.py 2006-03-31 02:41:32 UTC (rev 1226) </span><span class="lines">@@ -1,4 +1,4 @@ </span><del>-from sqlalchemy.sql import and_, select, func </del><ins>+import sqlalchemy.sql as sql </ins><span class="cx"> </span><span class="cx"> class SelectResults(object): </span><span class="cx"> def __init__(self, mapper, clause=None, ops={}): </span><span class="lines">@@ -10,27 +10,24 @@ </span><span class="cx"> def count(self): </span><span class="cx"> return self._mapper.count(self._clause) </span><span class="cx"> </span><del>- def __len__(self): - return self.count() - </del><span class="cx"> def min(self, col): </span><del>- return select([func.min(col)], self._clause, **self._ops).scalar() </del><ins>+ return sql.select([sql.func.min(col)], self._clause, **self._ops).scalar() </ins><span class="cx"> </span><span class="cx"> def max(self, col): </span><del>- return select([func.max(col)], self._clause, **self._ops).scalar() </del><ins>+ return sql.select([sql.func.max(col)], self._clause, **self._ops).scalar() </ins><span class="cx"> </span><span class="cx"> def sum(self, col): </span><del>- return select([func.sum(col)], self._clause, **self._ops).scalar() </del><ins>+ return sql.select([sql.func.sum(col)], self._clause, **self._ops).scalar() </ins><span class="cx"> </span><span class="cx"> def avg(self, col): </span><del>- return select([func.avg(col)], self._clause, **self._ops).scalar() </del><ins>+ return sql.select([sql.func.avg(col)], self._clause, **self._ops).scalar() </ins><span class="cx"> </span><span class="cx"> def clone(self): </span><span class="cx"> return SelectResults(self._mapper, self._clause, self._ops.copy()) </span><span class="cx"> </span><span class="cx"> def filter(self, clause): </span><span class="cx"> new = self.clone() </span><del>- new._clause = and_(self._clause, clause) </del><ins>+ new._clause = sql.and_(self._clause, clause) </ins><span class="cx"> return new </span><span class="cx"> </span><span class="cx"> def order_by(self, order_by): </span><span class="lines">@@ -70,4 +67,28 @@ </span><span class="cx"> return list(self[item:item+1])[0] </span><span class="cx"> </span><span class="cx"> def __iter__(self): </span><del>- return iter(self._mapper.select_whereclause(self._clause, **self._ops)) </del><span class="cx">\ No newline at end of file </span><ins>+ 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) </ins></span></pre> </div> </div> </body> </html> |
