Thread: [Sqlalchemy-commits] [2450] sqlalchemy/trunk: - fix for fetchmany() "size" argument being positiona
Brought to you by:
zzzeek
From: <co...@sq...> - 2007-03-28 00:10:37
|
<!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><meta http-equiv="content-type" content="text/html; charset=utf-8" /><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, #header, #footer { 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; } #header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; } #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>[2450] sqlalchemy/trunk: - fix for fetchmany() "size" argument being positional in most</title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>2450</dd> <dt>Author</dt> <dd>zzzeek</dd> <dt>Date</dt> <dd>2007-03-27 20:09:55 -0400 (Tue, 27 Mar 2007)</dd> </dl> <h3>Log Message</h3> <pre>- fix for fetchmany() "size" argument being positional in most dbapis [ticket:505]</pre> <h3>Modified Paths</h3> <ul> <li><a href="#sqlalchemytrunkCHANGES">sqlalchemy/trunk/CHANGES</a></li> <li><a href="#sqlalchemytrunklibsqlalchemyenginebasepy">sqlalchemy/trunk/lib/sqlalchemy/engine/base.py</a></li> <li><a href="#sqlalchemytrunktestsqlquerypy">sqlalchemy/trunk/test/sql/query.py</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="sqlalchemytrunkCHANGES"></a> <div class="modfile"><h4>Modified: sqlalchemy/trunk/CHANGES (2449 => 2450)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/trunk/CHANGES 2007-03-27 22:06:36 UTC (rev 2449) +++ sqlalchemy/trunk/CHANGES 2007-03-28 00:09:55 UTC (rev 2450) </span><span class="lines">@@ -7,6 +7,8 @@ </span><span class="cx"> accessor on the parent Selectable so theres no need to be aware </span><span class="cx"> of the genrerated label names [ticket:512]. </span><span class="cx"> - preliminary support for unicode table and column names added. </span><ins>+ - fix for fetchmany() "size" argument being positional in most + dbapis [ticket:505] </ins><span class="cx"> - orm: </span><span class="cx"> - improved/fixed custom collection classes when giving it "set"/ </span><span class="cx"> "sets.Set" classes or subclasses (was still looking for append() </span></span></pre></div> <a id="sqlalchemytrunklibsqlalchemyenginebasepy"></a> <div class="modfile"><h4>Modified: sqlalchemy/trunk/lib/sqlalchemy/engine/base.py (2449 => 2450)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/trunk/lib/sqlalchemy/engine/base.py 2007-03-27 22:06:36 UTC (rev 2449) +++ sqlalchemy/trunk/lib/sqlalchemy/engine/base.py 2007-03-28 00:09:55 UTC (rev 2450) </span><span class="lines">@@ -968,7 +968,7 @@ </span><span class="cx"> if size is None: </span><span class="cx"> rows = self.cursor.fetchmany() </span><span class="cx"> else: </span><del>- rows = self.cursor.fetchmany(size=size) </del><ins>+ rows = self.cursor.fetchmany(size) </ins><span class="cx"> l = [] </span><span class="cx"> for row in rows: </span><span class="cx"> l.append(RowProxy(self, row)) </span></span></pre></div> <a id="sqlalchemytrunktestsqlquerypy"></a> <div class="modfile"><h4>Modified: sqlalchemy/trunk/test/sql/query.py (2449 => 2450)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/trunk/test/sql/query.py 2007-03-27 22:06:36 UTC (rev 2449) +++ sqlalchemy/trunk/test/sql/query.py 2007-03-28 00:09:55 UTC (rev 2450) </span><span class="lines">@@ -53,7 +53,17 @@ </span><span class="cx"> for row in r: </span><span class="cx"> l.append(row) </span><span class="cx"> self.assert_(len(l) == 3) </span><del>- </del><ins>+ + def test_fetchmany(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.fetchmany(size=2): + l.append(row) + self.assert_(len(l) == 2, "fetchmany(size=2) got %s rows" % len(l)) + </ins><span class="cx"> def test_compiled_execute(self): </span><span class="cx"> s = select([self.users], self.users.c.user_id==bindparam('id')).compile() </span><span class="cx"> c = testbase.db.connect() </span></span></pre> </div> </div> </body> </html> |