[Sqlalchemy-commits] [1196] sqlalchemy/trunk/test: ResultProxy has an iterator interface
Brought to you by:
zzzeek
Menu
▾
▴
[Sqlalchemy-commits] [1196] sqlalchemy/trunk/test: ResultProxy has an iterator interface
|
From: <co...@sq...> - 2006-03-25 02:49:20
|
<!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>[1196] sqlalchemy/trunk/test: ResultProxy has an iterator interface</title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>1196</dd> <dt>Author</dt> <dd>zzzeek</dd> <dt>Date</dt> <dd>2006-03-24 20:49:10 -0600 (Fri, 24 Mar 2006)</dd> </dl> <h3>Log Message</h3> <pre>ResultProxy has an iterator interface</pre> <h3>Modified Paths</h3> <ul> <li><a href="#sqlalchemytrunklibsqlalchemyenginepy">sqlalchemy/trunk/lib/sqlalchemy/engine.py</a></li> <li><a href="#sqlalchemytrunktestquerypy">sqlalchemy/trunk/test/query.py</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="sqlalchemytrunklibsqlalchemyenginepy"></a> <div class="modfile"><h4>Modified: sqlalchemy/trunk/lib/sqlalchemy/engine.py (1195 => 1196)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/trunk/lib/sqlalchemy/engine.py 2006-03-25 02:25:59 UTC (rev 1195) +++ sqlalchemy/trunk/lib/sqlalchemy/engine.py 2006-03-25 02:49:10 UTC (rev 1196) </span><span class="lines">@@ -807,6 +807,14 @@ </span><span class="cx"> else: </span><span class="cx"> rec = self.props[key] </span><span class="cx"> return rec[0].convert_result_value(row[rec[1]], self.engine) </span><ins>+ + def __iter__(self): + while True: + row = self.fetchone() + if row is None: + raise StopIteration + else: + yield row </ins><span class="cx"> </span><span class="cx"> def fetchall(self): </span><span class="cx"> """fetches all rows, just like DBAPI cursor.fetchall().""" </span></span></pre></div> <a id="sqlalchemytrunktestquerypy"></a> <div class="modfile"><h4>Modified: sqlalchemy/trunk/test/query.py (1195 => 1196)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/trunk/test/query.py 2006-03-25 02:25:59 UTC (rev 1195) +++ sqlalchemy/trunk/test/query.py 2006-03-25 02:49:10 UTC (rev 1196) </span><span class="lines">@@ -4,6 +4,7 @@ </span><span class="cx"> </span><span class="cx"> import sqlalchemy.databases.sqlite as sqllite </span><span class="cx"> </span><ins>+import tables </ins><span class="cx"> db = testbase.db </span><span class="cx"> #db.echo='debug' </span><span class="cx"> from sqlalchemy import * </span><span class="lines">@@ -41,6 +42,16 @@ </span><span class="cx"> self.users.update(self.users.c.user_id == 7).execute(user_name = 'fred') </span><span class="cx"> print repr(self.users.select().execute().fetchall()) </span><span class="cx"> </span><ins>+ def testrowiteration(self): + self.users.insert().execute(user_id = 7, user_name = 'jack') + self.users.insert().execute(user_id = 8, user_name = 'ed') + self.users.insert().execute(user_id = 9, user_name = 'fred') + r = self.users.select().execute() + l = [] + for row in r: + l.append(row) + self.assert_(len(l) == 3) + </ins><span class="cx"> def testpassiveoverride(self): </span><span class="cx"> """primarily for postgres, tests that when we get a primary key column back </span><span class="cx"> from reflecting a table which has a default value on it, we pre-execute </span></span></pre> </div> </div> </body> </html> |
