[Sqlalchemy-commits] [1312] sqlalchemy/branches/schema/lib/sqlalchemy/mapping: more cascade...
Brought to you by:
zzzeek
Menu
▾
▴
[Sqlalchemy-commits] [1312] sqlalchemy/branches/schema/lib/sqlalchemy/mapping: more cascade...
|
From: <co...@sq...> - 2006-04-21 21:27:04
|
<!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>[1312] sqlalchemy/branches/schema/lib/sqlalchemy/mapping: more cascade...</title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>1312</dd> <dt>Author</dt> <dd>zzzeek</dd> <dt>Date</dt> <dd>2006-04-21 16:26:54 -0500 (Fri, 21 Apr 2006)</dd> </dl> <h3>Log Message</h3> <pre>more cascade...</pre> <h3>Modified Paths</h3> <ul> <li><a href="#sqlalchemybranchesschemalibsqlalchemymappingpropertiespy">sqlalchemy/branches/schema/lib/sqlalchemy/mapping/properties.py</a></li> <li><a href="#sqlalchemybranchesschemalibsqlalchemymappingunitofworkpy">sqlalchemy/branches/schema/lib/sqlalchemy/mapping/unitofwork.py</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="sqlalchemybranchesschemalibsqlalchemymappingpropertiespy"></a> <div class="modfile"><h4>Modified: sqlalchemy/branches/schema/lib/sqlalchemy/mapping/properties.py (1311 => 1312)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/branches/schema/lib/sqlalchemy/mapping/properties.py 2006-04-21 21:22:18 UTC (rev 1311) +++ sqlalchemy/branches/schema/lib/sqlalchemy/mapping/properties.py 2006-04-21 21:26:54 UTC (rev 1312) </span><span class="lines">@@ -253,7 +253,7 @@ </span><span class="cx"> </span><span class="cx"> def _set_class_attribute(self, class_, key): </span><span class="cx"> """sets attribute behavior on our target class.""" </span><del>- objectstore.global_attributes.register_attribute(class_, key, uselist = self.uselist, deleteremoved = self.private, extension=self.attributeext, cascade=self.cascade) </del><ins>+ objectstore.global_attributes.register_attribute(class_, key, uselist = self.uselist, extension=self.attributeext, cascade=self.cascade) </ins><span class="cx"> </span><span class="cx"> def _get_direction(self): </span><span class="cx"> """determines our 'direction', i.e. do we represent one to many, many to many, etc.""" </span><span class="lines">@@ -612,7 +612,7 @@ </span><span class="cx"> def _set_class_attribute(self, class_, key): </span><span class="cx"> # establish a class-level lazy loader on our class </span><span class="cx"> #print "SETCLASSATTR LAZY", repr(class_), key </span><del>- objectstore.global_attributes.register_attribute(class_, key, uselist = self.uselist, deleteremoved = self.private, callable_=lambda i: self.setup_loader(i), extension=self.attributeext, cascade=self.cascade) </del><ins>+ objectstore.global_attributes.register_attribute(class_, key, uselist = self.uselist, callable_=lambda i: self.setup_loader(i), extension=self.attributeext, cascade=self.cascade) </ins><span class="cx"> </span><span class="cx"> def setup_loader(self, instance): </span><span class="cx"> if not self.parent.is_assigned(instance): </span></span></pre></div> <a id="sqlalchemybranchesschemalibsqlalchemymappingunitofworkpy"></a> <div class="modfile"><h4>Modified: sqlalchemy/branches/schema/lib/sqlalchemy/mapping/unitofwork.py (1311 => 1312)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/branches/schema/lib/sqlalchemy/mapping/unitofwork.py 2006-04-21 21:22:18 UTC (rev 1311) +++ sqlalchemy/branches/schema/lib/sqlalchemy/mapping/unitofwork.py 2006-04-21 21:26:54 UTC (rev 1312) </span><span class="lines">@@ -39,20 +39,13 @@ </span><span class="cx"> class UOWListElement(attributes.ListAttribute): </span><span class="cx"> """overrides ListElement to provide unit-of-work "dirty" hooks when list attributes are modified, </span><span class="cx"> plus specialzed append() method.""" </span><del>- def __init__(self, obj, key, data=None, deleteremoved=False, cascade=None, **kwargs): </del><ins>+ def __init__(self, obj, key, data=None, cascade=None, **kwargs): </ins><span class="cx"> attributes.ListAttribute.__init__(self, obj, key, data=data, **kwargs) </span><del>- self.deleteremoved = deleteremoved </del><span class="cx"> self.cascade = cascade </span><span class="cx"> def value_changed(self, obj, key, item, listval, isdelete): </span><span class="cx"> sess = get_session(obj, raiseerror=False) </span><span class="cx"> if sess is None: </span><span class="cx"> return </span><del>- # add the child item to this session. if its already got an identity then its - # expected to be there already. - #sess.add(item) - #if not isdelete and sess.deleted.contains(item): - #raise InvalidRequestError("re-inserting a deleted value into a list") - # del sess.deleted[item] </del><span class="cx"> sess.modified_lists.append(self) </span><span class="cx"> if self.cascade is not None: </span><span class="cx"> if isdelete: </span><span class="lines">@@ -61,8 +54,6 @@ </span><span class="cx"> else: </span><span class="cx"> if "save-update" in self.cascade: </span><span class="cx"> sess.save_or_update(item) </span><del>- #if self.deleteremoved and isdelete: - # sess._register_deleted(item) </del><span class="cx"> def append(self, item, _mapper_nohistory = False): </span><span class="cx"> if _mapper_nohistory: </span><span class="cx"> self.append_nohistory(item) </span><span class="lines">@@ -70,6 +61,9 @@ </span><span class="cx"> attributes.ListAttribute.append(self, item) </span><span class="cx"> </span><span class="cx"> class UOWScalarElement(attributes.ScalarAttribute): </span><ins>+ def __init__(self, obj, key, cascade=None, **kwargs): + attributes.ScalarAttribute.__init__(self, obj, key, **kwargs) + self.cascade=cascade </ins><span class="cx"> def value_changed(self, oldvalue, newvalue): </span><span class="cx"> obj = self.obj </span><span class="cx"> sess = get_session(obj, raiseerror=False) </span><span class="lines">@@ -78,6 +72,13 @@ </span><span class="cx"> sess._register_dirty(obj) </span><span class="cx"> else: </span><span class="cx"> sess._register_new(obj) </span><ins>+ if self.cascade is not None: + if isdelete: + if "delete-orphan" in self.cascade: + sess.delete(item) + else: + if "save-update" in self.cascade: + sess.save_or_update(item) </ins><span class="cx"> </span><span class="cx"> class UOWAttributeManager(attributes.AttributeManager): </span><span class="cx"> """overrides AttributeManager to provide unit-of-work "dirty" hooks when scalar attribues are modified, plus factory methods for UOWProperrty/UOWListElement.""" </span></span></pre> </div> </div> </body> </html> |
