[Sqlalchemy-commits] [1317] sqlalchemy/branches/schema/test: some more dev....going to need to track
Brought to you by:
zzzeek
Menu
▾
▴
[Sqlalchemy-commits] [1317] sqlalchemy/branches/schema/test: some more dev....going to need to track child objects to parents
|
From: <co...@sq...> - 2006-04-22 19:01:51
|
<!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>[1317] sqlalchemy/branches/schema/test: some more dev....going to need to track child objects to parents</title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>1317</dd> <dt>Author</dt> <dd>zzzeek</dd> <dt>Date</dt> <dd>2006-04-22 14:01:37 -0500 (Sat, 22 Apr 2006)</dd> </dl> <h3>Log Message</h3> <pre>some more dev....going to need to track child objects to parents</pre> <h3>Modified Paths</h3> <ul> <li><a href="#sqlalchemybranchesschemalibsqlalchemymappingmapperpy">sqlalchemy/branches/schema/lib/sqlalchemy/mapping/mapper.py</a></li> <li><a href="#sqlalchemybranchesschemalibsqlalchemymappingobjectstorepy">sqlalchemy/branches/schema/lib/sqlalchemy/mapping/objectstore.py</a></li> <li><a href="#sqlalchemybranchesschemalibsqlalchemymappingpropertiespy">sqlalchemy/branches/schema/lib/sqlalchemy/mapping/properties.py</a></li> <li><a href="#sqlalchemybranchesschematestmanytomanypy">sqlalchemy/branches/schema/test/manytomany.py</a></li> <li><a href="#sqlalchemybranchesschematestobjectstorepy">sqlalchemy/branches/schema/test/objectstore.py</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="sqlalchemybranchesschemalibsqlalchemymappingmapperpy"></a> <div class="modfile"><h4>Modified: sqlalchemy/branches/schema/lib/sqlalchemy/mapping/mapper.py (1316 => 1317)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/branches/schema/lib/sqlalchemy/mapping/mapper.py 2006-04-22 17:36:30 UTC (rev 1316) +++ sqlalchemy/branches/schema/lib/sqlalchemy/mapping/mapper.py 2006-04-22 19:01:37 UTC (rev 1317) </span><span class="lines">@@ -694,8 +694,9 @@ </span><span class="cx"> def cascade_iterator(self, type, object, recursive=None): </span><span class="cx"> if recursive is None: </span><span class="cx"> recursive=sets.Set() </span><del>- recursive.add(object) - yield object </del><ins>+ if object not in recursive: + recursive.add(object) + yield object </ins><span class="cx"> for prop in self.props.values(): </span><span class="cx"> for c in prop.cascade_iterator(type, object, recursive): </span><span class="cx"> yield c </span></span></pre></div> <a id="sqlalchemybranchesschemalibsqlalchemymappingobjectstorepy"></a> <div class="modfile"><h4>Modified: sqlalchemy/branches/schema/lib/sqlalchemy/mapping/objectstore.py (1316 => 1317)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/branches/schema/lib/sqlalchemy/mapping/objectstore.py 2006-04-22 17:36:30 UTC (rev 1316) +++ sqlalchemy/branches/schema/lib/sqlalchemy/mapping/objectstore.py 2006-04-22 19:01:37 UTC (rev 1317) </span><span class="lines">@@ -338,6 +338,7 @@ </span><span class="cx"> the keyword argument 'entity_name' can also be provided which will be used by the import.""" </span><span class="cx"> for o in obj: </span><span class="cx"> for c in object_mapper(o, **kwargs).cascade_iterator('delete', o): </span><ins>+ print "CASCADING DELETE TO", c </ins><span class="cx"> if not self._is_bound(c): </span><span class="cx"> c = self.import_(c, **kwargs) </span><span class="cx"> self.uow.register_deleted(c) </span></span></pre></div> <a id="sqlalchemybranchesschemalibsqlalchemymappingpropertiespy"></a> <div class="modfile"><h4>Modified: sqlalchemy/branches/schema/lib/sqlalchemy/mapping/properties.py (1316 => 1317)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/branches/schema/lib/sqlalchemy/mapping/properties.py 2006-04-22 17:36:30 UTC (rev 1316) +++ sqlalchemy/branches/schema/lib/sqlalchemy/mapping/properties.py 2006-04-22 19:01:37 UTC (rev 1317) </span><span class="lines">@@ -145,7 +145,7 @@ </span><span class="cx"> if private: </span><span class="cx"> self.cascade = mapperutil.CascadeOptions("save-update, delete-orphan, delete") </span><span class="cx"> else: </span><del>- self.cascade = mapperutil.CascadeOptions("save-update") </del><ins>+ self.cascade = mapperutil.CascadeOptions() </ins><span class="cx"> </span><span class="cx"> self.association = association </span><span class="cx"> if selectalias is not None: </span><span class="lines">@@ -174,12 +174,13 @@ </span><span class="cx"> childlist = objectstore.global_attributes.get_history(object, self.key, passive = False) </span><span class="cx"> else: </span><span class="cx"> childlist = objectstore.global_attributes.get_history(object, self.key) </span><ins>+ </ins><span class="cx"> for c in childlist.added_items() + childlist.deleted_items() + childlist.unchanged_items(): </span><del>- if c is not None and c not in recursive: - recursive.add(c) - yield c - for c2 in self.mapper.cascade_iterator(type, c, recursive): - if c2 not in recursive: </del><ins>+ if c is not None: + if c not in recursive: + recursive.add(c) + yield c + for c2 in self.mapper.cascade_iterator(type, c, recursive): </ins><span class="cx"> yield c2 </span><span class="cx"> </span><span class="cx"> def copy(self): </span><span class="lines">@@ -498,18 +499,23 @@ </span><span class="cx"> # the child objects have to have their foreign key to the parent set to NULL </span><span class="cx"> if self.private and not self.post_update: </span><span class="cx"> for obj in deplist: </span><ins>+ print "HI ON", obj </ins><span class="cx"> childlist = getlist(obj, False) </span><span class="cx"> for child in childlist.deleted_items() + childlist.unchanged_items(): </span><span class="cx"> if child is None: </span><span class="cx"> continue </span><span class="cx"> # if private child object, and is in the uow's "deleted" list, </span><span class="cx"> # insure its in the list of items to be deleted </span><ins>+ print "DEL CHILD", child </ins><span class="cx"> if child in uowcommit.uow.deleted: </span><ins>+ print "REGISTER", child </ins><span class="cx"> uowcommit.register_object(child, isdelete=True) </span><span class="cx"> else: </span><span class="cx"> for obj in deplist: </span><ins>+ print "HI 2 ON", obj </ins><span class="cx"> childlist = getlist(obj, False) </span><span class="cx"> for child in childlist.deleted_items() + childlist.unchanged_items(): </span><ins>+ print "DELCHILD", child </ins><span class="cx"> if child is not None: </span><span class="cx"> self._synchronize(obj, child, None, True) </span><span class="cx"> uowcommit.register_object(child, postupdate=self.post_update) </span><span class="lines">@@ -554,6 +560,7 @@ </span><span class="cx"> childlist = getlist(obj, passive=True) </span><span class="cx"> if childlist is not None: </span><span class="cx"> for child in childlist.added_items(): </span><ins>+ print "ADDCHILD", child </ins><span class="cx"> self._synchronize(obj, child, None, False) </span><span class="cx"> if self.direction == PropertyLoader.ONETOMANY and child is not None: </span><span class="cx"> uowcommit.register_object(child, postupdate=self.post_update) </span></span></pre></div> <a id="sqlalchemybranchesschematestmanytomanypy"></a> <div class="modfile"><h4>Modified: sqlalchemy/branches/schema/test/manytomany.py (1316 => 1317)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/branches/schema/test/manytomany.py 2006-04-22 17:36:30 UTC (rev 1316) +++ sqlalchemy/branches/schema/test/manytomany.py 2006-04-22 19:01:37 UTC (rev 1317) </span><span class="lines">@@ -63,7 +63,7 @@ </span><span class="cx"> ) </span><span class="cx"> </span><span class="cx"> global place_place </span><del>- place_place = Table('place_place', db, </del><ins>+ place_place = Table('place_place', metadata, </ins><span class="cx"> Column('pl1_id', Integer, ForeignKey('place.place_id')), </span><span class="cx"> Column('pl2_id', Integer, ForeignKey('place.place_id')), </span><span class="cx"> ) </span></span></pre></div> <a id="sqlalchemybranchesschematestobjectstorepy"></a> <div class="modfile"><h4>Modified: sqlalchemy/branches/schema/test/objectstore.py (1316 => 1317)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/branches/schema/test/objectstore.py 2006-04-22 17:36:30 UTC (rev 1316) +++ sqlalchemy/branches/schema/test/objectstore.py 2006-04-22 19:01:37 UTC (rev 1317) </span><span class="lines">@@ -538,6 +538,27 @@ </span><span class="cx"> u.address.email_address = 'im...@fo...' </span><span class="cx"> objectstore.get_session().flush() </span><span class="cx"> </span><ins>+ def testchildmove(self): + m = mapper(User, users, properties = dict( + addresses = relation(mapper(Address, addresses), lazy = True, private = False) + )) + u1 = User() + u1.user_name = 'user1' + u2 = User() + u2.user_name = 'user2' + a = Address() + a.email_address = 'address1' + u1.addresses.append(a) + objectstore.flush() + del u1.addresses[0] + u2.addresses.append(a) + objectstore.delete(u1) + objectstore.flush() + objectstore.clear() + u2 = m.get(u2.user_id) + assert len(u2.addresses) == 1 + + </ins><span class="cx"> def testdelete(self): </span><span class="cx"> m = mapper(User, users, properties = dict( </span><span class="cx"> address = relation(mapper(Address, addresses), lazy = True, uselist = False, private = False) </span></span></pre> </div> </div> </body> </html> |
