[Sqlalchemy-commits] [1186] sqlalchemy/trunk/lib/sqlalchemy/mapping/properties.py: added some extra
Brought to you by:
zzzeek
Menu
▾
▴
[Sqlalchemy-commits] [1186] sqlalchemy/trunk/lib/sqlalchemy/mapping/properties.py: added some extra traversal for one-to-many/many-to-one "private" relations to allow single-object commits to cascade into private child objects
<!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>[1186] sqlalchemy/trunk/lib/sqlalchemy/mapping/properties.py: added some extra traversal for one-to-many/many-to-one "private" relations to allow single-object commits to cascade into private child objects</title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>1186</dd> <dt>Author</dt> <dd>zzzeek</dd> <dt>Date</dt> <dd>2006-03-22 15:25:10 -0600 (Wed, 22 Mar 2006)</dd> </dl> <h3>Log Message</h3> <pre>added some extra traversal for one-to-many/many-to-one "private" relations to allow single-object commits to cascade into private child objects</pre> <h3>Modified Paths</h3> <ul> <li><a href="#sqlalchemytrunklibsqlalchemymappingpropertiespy">sqlalchemy/trunk/lib/sqlalchemy/mapping/properties.py</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="sqlalchemytrunklibsqlalchemymappingpropertiespy"></a> <div class="modfile"><h4>Modified: sqlalchemy/trunk/lib/sqlalchemy/mapping/properties.py (1185 => 1186)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/trunk/lib/sqlalchemy/mapping/properties.py 2006-03-22 17:06:49 UTC (rev 1185) +++ sqlalchemy/trunk/lib/sqlalchemy/mapping/properties.py 2006-03-22 21:25:10 UTC (rev 1186) </span><span class="lines">@@ -382,6 +382,7 @@ </span><span class="cx"> else: </span><span class="cx"> uowcommit.register_dependency(self.mapper, self.parent) </span><span class="cx"> uowcommit.register_processor(self.mapper, self, self.parent, False) </span><ins>+ uowcommit.register_processor(self.mapper, self, self.parent, True) </ins><span class="cx"> else: </span><span class="cx"> raise AssertionError(" no foreign key ?") </span><span class="cx"> </span><span class="lines">@@ -444,7 +445,12 @@ </span><span class="cx"> statement = self.secondary.insert() </span><span class="cx"> statement.execute(*secondary_insert) </span><span class="cx"> elif self.direction == PropertyLoader.MANYTOONE and delete: </span><del>- if self.post_update: </del><ins>+ if self.private: + for obj in deplist: + childlist = getlist(obj, False) + for child in childlist.deleted_items() + childlist.unchanged_items(): + uowcommit.register_object(child, isdelete=True) + elif self.post_update: </ins><span class="cx"> # post_update means we have to update our row to not reference the child object </span><span class="cx"> # before we can DELETE the row </span><span class="cx"> for obj in deplist: </span><span class="lines">@@ -455,14 +461,20 @@ </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"> # if we are privately managed, then all our objects should </span><del>- # have been marked as "todelete" already and no attribute adjustment is needed - return - for obj in deplist: - childlist = getlist(obj, False) - for child in childlist.deleted_items() + childlist.unchanged_items(): - if child is not None: - self._synchronize(obj, child, None, True) - uowcommit.register_object(child, postupdate=self.post_update) </del><ins>+ # have been marked as "todelete" already and no attribute adjustment is needed. + # however, if they say objectstore.commit(x), i.e. on an individual object, + # then this extra step is more important. + for obj in deplist: + childlist = getlist(obj, False) + for child in childlist.deleted_items() + childlist.unchanged_items(): + uowcommit.register_object(child, isdelete=True) + else: + for obj in deplist: + childlist = getlist(obj, False) + for child in childlist.deleted_items() + childlist.unchanged_items(): + if child is not None: + self._synchronize(obj, child, None, True) + uowcommit.register_object(child, postupdate=self.post_update) </ins><span class="cx"> elif self.association is not None: </span><span class="cx"> # manage association objects. </span><span class="cx"> for obj in deplist: </span></span></pre> </div> </div> </body> </html> |
