[Sqlalchemy-commits] [1008] sqlalchemy/branches/new_eagerload/lib/sqlalchemy/mapping/properties.py:
Brought to you by:
zzzeek
Menu
▾
▴
[Sqlalchemy-commits] [1008] sqlalchemy/branches/new_eagerload/lib/sqlalchemy/mapping/properties.py: got the petrinet workin (j.yang's test)
|
From: <co...@sq...> - 2006-02-22 07:46:21
|
<!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>[1008] sqlalchemy/branches/new_eagerload/lib/sqlalchemy/mapping/properties.py: got the petrinet workin (j.yang's test)</title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>1008</dd> <dt>Author</dt> <dd>zzzeek</dd> <dt>Date</dt> <dd>2006-02-20 13:25:17 -0600 (Mon, 20 Feb 2006)</dd> </dl> <h3>Log Message</h3> <pre>got the petrinet workin (j.yang's test)</pre> <h3>Modified Paths</h3> <ul> <li><a href="#sqlalchemybranchesnew_eagerloadlibsqlalchemymappingpropertiespy">sqlalchemy/branches/new_eagerload/lib/sqlalchemy/mapping/properties.py</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="sqlalchemybranchesnew_eagerloadlibsqlalchemymappingpropertiespy"></a> <div class="modfile"><h4>Modified: sqlalchemy/branches/new_eagerload/lib/sqlalchemy/mapping/properties.py (1007 => 1008)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/branches/new_eagerload/lib/sqlalchemy/mapping/properties.py 2006-02-20 19:05:11 UTC (rev 1007) +++ sqlalchemy/branches/new_eagerload/lib/sqlalchemy/mapping/properties.py 2006-02-20 19:25:17 UTC (rev 1008) </span><span class="lines">@@ -766,32 +766,34 @@ </span><span class="cx"> self.eager_order_by = None </span><span class="cx"> </span><span class="cx"> eagerprops = [] </span><ins>+ # create a new "eager chain", starting from this eager loader and descending downwards + # through all sub-eagerloaders. this will copy all those eagerloaders and have them set up + # aliases distinct to this eager chain. if a recursive relationship to any of the tables is detected, + # the chain will terminate by copying that eager loader into a lazy loader. </ins><span class="cx"> for key, prop in self.mapper.props.iteritems(): </span><span class="cx"> if isinstance(prop, EagerLoader): </span><span class="cx"> eagerprops.append(prop) </span><span class="cx"> if len(eagerprops): </span><del>- recursion_stack[self.target] = True </del><ins>+ recursion_stack[self.parent.table] = True </ins><span class="cx"> self.mapper = self.mapper.copy() </span><span class="cx"> try: </span><span class="cx"> for prop in eagerprops: </span><ins>+ if recursion_stack.has_key(prop.target): + # recursion - set the relationship as a LazyLoader + p = EagerLazyOption(None, False).create_prop(self.mapper, prop.key) + continue </ins><span class="cx"> p = prop.copy() </span><span class="cx"> p.use_alias=True </span><del>- </del><span class="cx"> self.mapper.props[prop.key] = p </span><del>- - print "we are:", id(self), self.target.name, (self.secondary and self.secondary.name or "None"), self.parent.table.name - print "prop is",id(prop), prop.target.name, (prop.secondary and prop.secondary.name or "None"), prop.parent.table.name - if recursion_stack.has_key(prop.target): - raise ArgumentError("Circular eager load relationship detected on " + str(self.mapper) + " " + key + repr(self.mapper.props)) - </del><ins>+ #print "we are:", id(self), self.target.name, (self.secondary and self.secondary.name or "None"), self.parent.table.name + #print "prop is",id(prop), prop.target.name, (prop.secondary and prop.secondary.name or "None"), prop.parent.table.name </ins><span class="cx"> p.do_init_subclass(prop.key, prop.parent, recursion_stack) </span><del>- </del><span class="cx"> p.eagerprimary = p.eagerprimary.copy_container() </span><span class="cx"> aliasizer = Aliasizer(p.parent.table, aliases={p.parent.table:self.eagertarget}) </span><span class="cx"> p.eagerprimary.accept_visitor(aliasizer) </span><del>- print "new eagertqarget", p.eagertarget.name, (p.secondary and p.secondary.name or "none"), p.parent.table.name </del><ins>+ #print "new eagertqarget", p.eagertarget.name, (p.secondary and p.secondary.name or "none"), p.parent.table.name </ins><span class="cx"> finally: </span><del>- del recursion_stack[self.target] </del><ins>+ del recursion_stack[self.parent.table] </ins><span class="cx"> </span><span class="cx"> def _aliasize_orderby(self, orderby, copy=True): </span><span class="cx"> if copy: </span><span class="lines">@@ -881,6 +883,7 @@ </span><span class="cx"> def create_prop(self, mapper, key): </span><span class="cx"> kwargs = util.constructor_args(oldprop) </span><span class="cx"> mapper.set_property(key, class_(**kwargs )) </span><ins>+ </ins><span class="cx"> </span><span class="cx"> class EagerLazyOption(GenericOption): </span><span class="cx"> """an option that switches a PropertyLoader to be an EagerLoader or LazyLoader""" </span></span></pre> </div> </div> </body> </html> |
