[Sqlalchemy-commits] [1208] sqlalchemy/trunk/test: removed circular loop in creating new list elemen
Brought to you by:
zzzeek
Menu
▾
▴
[Sqlalchemy-commits] [1208] sqlalchemy/trunk/test: removed circular loop in creating new list elements, fixes a common refresh() condition
|
From: <co...@sq...> - 2006-03-25 21:44:52
|
<!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>[1208] sqlalchemy/trunk/test: removed circular loop in creating new list elements, fixes a common refresh() condition</title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>1208</dd> <dt>Author</dt> <dd>zzzeek</dd> <dt>Date</dt> <dd>2006-03-25 15:44:42 -0600 (Sat, 25 Mar 2006)</dd> </dl> <h3>Log Message</h3> <pre>removed circular loop in creating new list elements, fixes a common refresh() condition added None check in PropertyLoader many-to-one private deletion traversal, fixes byroot_tree (add a unit test for that)</pre> <h3>Modified Paths</h3> <ul> <li><a href="#sqlalchemytrunklibsqlalchemyattributespy">sqlalchemy/trunk/lib/sqlalchemy/attributes.py</a></li> <li><a href="#sqlalchemytrunklibsqlalchemymappingpropertiespy">sqlalchemy/trunk/lib/sqlalchemy/mapping/properties.py</a></li> <li><a href="#sqlalchemytrunktestmapperpy">sqlalchemy/trunk/test/mapper.py</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="sqlalchemytrunklibsqlalchemyattributespy"></a> <div class="modfile"><h4>Modified: sqlalchemy/trunk/lib/sqlalchemy/attributes.py (1207 => 1208)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/trunk/lib/sqlalchemy/attributes.py 2006-03-25 21:14:54 UTC (rev 1207) +++ sqlalchemy/trunk/lib/sqlalchemy/attributes.py 2006-03-25 21:44:42 UTC (rev 1208) </span><span class="lines">@@ -144,6 +144,8 @@ </span><span class="cx"> # list that might be set on the object already </span><span class="cx"> try: </span><span class="cx"> list_ = obj.__dict__[key] </span><ins>+ if list_ is data: + raise InvalidArgumentError("Creating a list element passing the object's list as an argument") </ins><span class="cx"> if data is not None: </span><span class="cx"> for d in data: </span><span class="cx"> list_.append(d) </span><span class="lines">@@ -435,8 +437,7 @@ </span><span class="cx"> elif not uselist: </span><span class="cx"> return PropHistory(obj, key, **kwargs) </span><span class="cx"> else: </span><del>- list_ = obj.__dict__.get(key, None) - return self.create_list(obj, key, list_, **kwargs) </del><ins>+ return self.create_list(obj, key, None, **kwargs) </ins><span class="cx"> </span><span class="cx"> def register_attribute(self, class_, key, uselist, callable_=None, **kwargs): </span><span class="cx"> """registers an attribute's behavior at the class level. This attribute </span></span></pre></div> <a id="sqlalchemytrunklibsqlalchemymappingpropertiespy"></a> <div class="modfile"><h4>Modified: sqlalchemy/trunk/lib/sqlalchemy/mapping/properties.py (1207 => 1208)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/trunk/lib/sqlalchemy/mapping/properties.py 2006-03-25 21:14:54 UTC (rev 1207) +++ sqlalchemy/trunk/lib/sqlalchemy/mapping/properties.py 2006-03-25 21:44:42 UTC (rev 1208) </span><span class="lines">@@ -449,6 +449,8 @@ </span><span class="cx"> for obj in deplist: </span><span class="cx"> childlist = getlist(obj, False) </span><span class="cx"> for child in childlist.deleted_items() + childlist.unchanged_items(): </span><ins>+ if child is None: + continue </ins><span class="cx"> uowcommit.register_object(child, isdelete=True) </span><span class="cx"> elif self.post_update: </span><span class="cx"> # post_update means we have to update our row to not reference the child object </span><span class="lines">@@ -467,6 +469,8 @@ </span><span class="cx"> for obj in deplist: </span><span class="cx"> childlist = getlist(obj, False) </span><span class="cx"> for child in childlist.deleted_items() + childlist.unchanged_items(): </span><ins>+ if child is None: + continue </ins><span class="cx"> uowcommit.register_object(child, isdelete=True) </span><span class="cx"> else: </span><span class="cx"> for obj in deplist: </span></span></pre></div> <a id="sqlalchemytrunktestmapperpy"></a> <div class="modfile"><h4>Modified: sqlalchemy/trunk/test/mapper.py (1207 => 1208)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/trunk/test/mapper.py 2006-03-25 21:14:54 UTC (rev 1207) +++ sqlalchemy/trunk/test/mapper.py 2006-03-25 21:44:42 UTC (rev 1208) </span><span class="lines">@@ -118,6 +118,27 @@ </span><span class="cx"> self.assert_(a not in u.addresses) </span><span class="cx"> # not dirty anymore </span><span class="cx"> self.assert_(u not in objectstore.get_session().uow.dirty) </span><ins>+ + def testrefresh2(self): + assign_mapper(Address, addresses) + + assign_mapper(User, users, properties = dict(addresses=relation(Address.mapper,private=True,lazy=False)) ) + + u=User() + u.user_name='Justin' + a = Address() + a.address_id=17 # to work around the hardcoded IDs in this test suite.... + u.addresses.append(a) + objectstore.commit() + objectstore.clear() + u = User.mapper.selectfirst() + print u.user_name + + #ok so far + u.expire() #hangs when + print u.user_name #this line runs + + u.refresh() #hangs </ins><span class="cx"> </span><span class="cx"> def testmagic(self): </span><span class="cx"> m = mapper(User, users, properties = { </span></span></pre> </div> </div> </body> </html> |
