[Sqlalchemy-commits] [1143] sqlalchemy/trunk: fixed attributes bug where if an object is committed,
Brought to you by:
zzzeek
Menu
▾
▴
[Sqlalchemy-commits] [1143] sqlalchemy/trunk: fixed attributes bug where if an object is committed, its lazy-loaded list got
|
From: <co...@sq...> - 2006-03-14 16:56:17
|
<!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>[1143] sqlalchemy/trunk: fixed attributes bug where if an object is committed, its lazy-loaded list got </title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>1143</dd> <dt>Author</dt> <dd>zzzeek</dd> <dt>Date</dt> <dd>2006-03-14 10:56:05 -0600 (Tue, 14 Mar 2006)</dd> </dl> <h3>Log Message</h3> <pre>fixed attributes bug where if an object is committed, its lazy-loaded list got blown away if it hadnt been loaded</pre> <h3>Modified Paths</h3> <ul> <li><a href="#sqlalchemytrunkCHANGES">sqlalchemy/trunk/CHANGES</a></li> <li><a href="#sqlalchemytrunklibsqlalchemyattributespy">sqlalchemy/trunk/lib/sqlalchemy/attributes.py</a></li> <li><a href="#sqlalchemytrunktestobjectstorepy">sqlalchemy/trunk/test/objectstore.py</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="sqlalchemytrunkCHANGES"></a> <div class="modfile"><h4>Modified: sqlalchemy/trunk/CHANGES (1142 => 1143)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/trunk/CHANGES 2006-03-14 16:49:15 UTC (rev 1142) +++ sqlalchemy/trunk/CHANGES 2006-03-14 16:56:05 UTC (rev 1143) </span><span class="lines">@@ -1,3 +1,7 @@ </span><ins>+0.1.5 +- fixed attributes bug where if an object is committed, its lazy-loaded list got +blown away if it hadnt been loaded + </ins><span class="cx"> 0.1.4 </span><span class="cx"> - create_engine() now uses genericized parameters; host/hostname, db/dbname/database, </span><span class="cx"> password/passwd, etc. for all engine connections. makes engine URIs much more "universal" </span></span></pre></div> <a id="sqlalchemytrunklibsqlalchemyattributespy"></a> <div class="modfile"><h4>Modified: sqlalchemy/trunk/lib/sqlalchemy/attributes.py (1142 => 1143)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/trunk/lib/sqlalchemy/attributes.py 2006-03-14 16:49:15 UTC (rev 1142) +++ sqlalchemy/trunk/lib/sqlalchemy/attributes.py 2006-03-14 16:56:05 UTC (rev 1143) </span><span class="lines">@@ -214,7 +214,7 @@ </span><span class="cx"> value = None </span><span class="cx"> p = self.manager.create_list(self.obj, self.key, value, readonly=self.live, **self.kwargs) </span><span class="cx"> </span><del>- if not self.live: </del><ins>+ if not self.live and not passive: </ins><span class="cx"> # set the new history list as the new attribute, discards ourself </span><span class="cx"> self.manager.attribute_history(self.obj)[self.key] = p </span><span class="cx"> self.manager = None </span></span></pre></div> <a id="sqlalchemytrunktestobjectstorepy"></a> <div class="modfile"><h4>Modified: sqlalchemy/trunk/test/objectstore.py (1142 => 1143)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/trunk/test/objectstore.py 2006-03-14 16:49:15 UTC (rev 1142) +++ sqlalchemy/trunk/test/objectstore.py 2006-03-14 16:56:05 UTC (rev 1143) </span><span class="lines">@@ -386,6 +386,26 @@ </span><span class="cx"> self.assert_(u.user_id == userlist[0].user_id and userlist[0].user_name == 'modifiedname') </span><span class="cx"> self.assert_(u2.user_id == userlist[1].user_id and userlist[1].user_name == 'savetester2') </span><span class="cx"> </span><ins>+ def testlazyattrcommit(self): + """tests that when a lazy-loaded list is unloaded, and a commit occurs, that the + 'passive' call on that list does not blow away its value""" + m1 = mapper(User, users, properties = { + 'addresses': relation(mapper(Address, addresses)) + }) + + u = User() + u.addresses.append(Address()) + u.addresses.append(Address()) + u.addresses.append(Address()) + u.addresses.append(Address()) + objectstore.commit() + objectstore.clear() + ulist = m1.select() + u1 = ulist[0] + u1.user_name = 'newname' + objectstore.commit() + self.assert_(len(u1.addresses) == 4) + </ins><span class="cx"> def testinherits(self): </span><span class="cx"> m1 = mapper(User, users) </span><span class="cx"> </span></span></pre> </div> </div> </body> </html> |