[Sqlalchemy-commits] [1013] sqlalchemy/trunk/test: fix to EagerLoad where it late-initializes its ea
Brought to you by:
zzzeek
Menu
▾
▴
[Sqlalchemy-commits] [1013] sqlalchemy/trunk/test: fix to EagerLoad where it late-initializes its eager chain, thereby not getting messed up by late add_property() calls
<!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>[1013] sqlalchemy/trunk/test: fix to EagerLoad where it late-initializes its eager chain, thereby not getting messed up by late add_property() calls</title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>1013</dd> <dt>Author</dt> <dd>zzzeek</dd> <dt>Date</dt> <dd>2006-02-21 18:28:59 -0600 (Tue, 21 Feb 2006)</dd> </dl> <h3>Log Message</h3> <pre>fix to EagerLoad where it late-initializes its eager chain, thereby not getting messed up by late add_property() calls</pre> <h3>Modified Paths</h3> <ul> <li><a href="#sqlalchemytrunklibsqlalchemymappingpropertiespy">sqlalchemy/trunk/lib/sqlalchemy/mapping/properties.py</a></li> <li><a href="#sqlalchemytrunklibsqlalchemyschemapy">sqlalchemy/trunk/lib/sqlalchemy/schema.py</a></li> <li><a href="#sqlalchemytrunklibsqlalchemysqlpy">sqlalchemy/trunk/lib/sqlalchemy/sql.py</a></li> </ul> <h3>Added Paths</h3> <ul> <li><a href="#sqlalchemytrunktesteagertest1py">sqlalchemy/trunk/test/eagertest1.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 (1012 => 1013)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/trunk/lib/sqlalchemy/mapping/properties.py 2006-02-21 03:01:43 UTC (rev 1012) +++ sqlalchemy/trunk/lib/sqlalchemy/mapping/properties.py 2006-02-22 00:28:59 UTC (rev 1013) </span><span class="lines">@@ -740,9 +740,6 @@ </span><span class="cx"> def do_init_subclass(self, key, parent, recursion_stack=None): </span><span class="cx"> parent._has_eager = True </span><span class="cx"> </span><del>- if recursion_stack is None: - recursion_stack = {} - </del><span class="cx"> self.eagertarget = self.target.alias() </span><span class="cx"> if self.secondary: </span><span class="cx"> self.eagersecondary = self.secondary.alias() </span><span class="lines">@@ -764,6 +761,14 @@ </span><span class="cx"> else: </span><span class="cx"> self.eager_order_by = None </span><span class="cx"> </span><ins>+ + def _create_eager_chain(self, in_chain=False, recursion_stack=None): + if not in_chain and getattr(self, '_eager_chained', False): + return + + if recursion_stack is None: + recursion_stack = {} + </ins><span class="cx"> eagerprops = [] </span><span class="cx"> # create a new "eager chain", starting from this eager loader and descending downwards </span><span class="cx"> # through all sub-eagerloaders. this will copy all those eagerloaders and have them set up </span><span class="lines">@@ -783,15 +788,17 @@ </span><span class="cx"> continue </span><span class="cx"> p = prop.copy() </span><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 </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><ins>+ p._create_eager_chain(in_chain=True, recursion_stack=recursion_stack) </ins><span class="cx"> p.eagerprimary = p.eagerprimary.copy_container() </span><del>- aliasizer = Aliasizer(p.parent.table, aliases={p.parent.table:self.eagertarget}) - p.eagerprimary.accept_visitor(aliasizer) </del><ins>+# aliasizer = Aliasizer(p.parent.table, aliases={p.parent.table:self.eagertarget}) + p.eagerprimary.accept_visitor(self.aliasizer) </ins><span class="cx"> #print "new eagertqarget", p.eagertarget.name, (p.secondary and p.secondary.name or "none"), p.parent.table.name </span><span class="cx"> finally: </span><span class="cx"> del recursion_stack[self.parent.table] </span><ins>+ self._eager_chained = True </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">@@ -808,11 +815,15 @@ </span><span class="cx"> def setup(self, key, statement, eagertable=None, **options): </span><span class="cx"> """add a left outer join to the statement thats being constructed""" </span><span class="cx"> </span><ins>+ # initialize the eager chains late in the game + self._create_eager_chain() + </ins><span class="cx"> if hasattr(statement, '_outerjoin'): </span><span class="cx"> towrap = statement._outerjoin </span><span class="cx"> else: </span><span class="cx"> towrap = self.parent.table </span><span class="cx"> </span><ins>+ # print "hello, towrap", str(towrap) </ins><span class="cx"> if self.secondaryjoin is not None: </span><span class="cx"> statement._outerjoin = sql.outerjoin(towrap, self.eagersecondary, self.eagerprimary).outerjoin(self.eagertarget, self.eagersecondaryjoin) </span><span class="cx"> if self.order_by is False and self.secondary.default_order_by() is not None: </span></span></pre></div> <a id="sqlalchemytrunklibsqlalchemyschemapy"></a> <div class="modfile"><h4>Modified: sqlalchemy/trunk/lib/sqlalchemy/schema.py (1012 => 1013)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/trunk/lib/sqlalchemy/schema.py 2006-02-21 03:01:43 UTC (rev 1012) +++ sqlalchemy/trunk/lib/sqlalchemy/schema.py 2006-02-22 00:28:59 UTC (rev 1013) </span><span class="lines">@@ -154,6 +154,12 @@ </span><span class="cx"> ["%s=%s" % (k, repr(getattr(self, k))) for k in ['schema']] </span><span class="cx"> , ',\n') </span><span class="cx"> </span><ins>+ def __str__(self): + if self.schema is None: + return self.name + else: + return self.schema + "." + self.name + </ins><span class="cx"> def hash_key(self): </span><span class="cx"> return "Table(%s)" % string.join( </span><span class="cx"> [repr(self.name)] + [self.engine.hash_key()] + </span></span></pre></div> <a id="sqlalchemytrunklibsqlalchemysqlpy"></a> <div class="modfile"><h4>Modified: sqlalchemy/trunk/lib/sqlalchemy/sql.py (1012 => 1013)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/trunk/lib/sqlalchemy/sql.py 2006-02-21 03:01:43 UTC (rev 1012) +++ sqlalchemy/trunk/lib/sqlalchemy/sql.py 2006-02-22 00:28:59 UTC (rev 1013) </span><span class="lines">@@ -870,7 +870,7 @@ </span><span class="cx"> crit.append(secondary._get_col_by_original(fk.column) == fk.parent) </span><span class="cx"> self.foreignkey = fk.parent </span><span class="cx"> if len(crit) == 0: </span><del>- raise ArgumentError("Cant find any foreign key relationships between '%s' (%s) and '%s' (%s)" % (primary.name, repr(primary), secondary.name, repr(secondary))) </del><ins>+ raise ArgumentError("Cant find any foreign key relationships between '%s' and '%s'" % (primary.name, secondary.name)) </ins><span class="cx"> elif len(crit) == 1: </span><span class="cx"> return (crit[0]) </span><span class="cx"> else: </span></span></pre></div> <a id="sqlalchemytrunktesteagertest1py"></a> <div class="addfile"><h4>Added: sqlalchemy/trunk/test/eagertest1.py (1012 => 1013)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/trunk/test/eagertest1.py 2006-02-21 03:01:43 UTC (rev 1012) +++ sqlalchemy/trunk/test/eagertest1.py 2006-02-22 00:28:59 UTC (rev 1013) </span><span class="lines">@@ -0,0 +1,60 @@ </span><ins>+from sqlalchemy import * + +class Part(object):pass +class Design(object):pass +class DesignType(object):pass +class InheritedPart(object):pass + +engine = create_engine('sqlite://', echo=True) + +designType = Table('design_types', engine, + Column('design_type_id', Integer, primary_key=True), + ) + +design =Table('design', engine, + Column('design_id', Integer, primary_key=True), + Column('design_type_id', Integer, ForeignKey('design_types.design_type_id'))) + +part = Table('parts', engine, + Column('part_id', Integer, primary_key=True), + Column('design_id', Integer, ForeignKey('design.design_id')), + Column('design_type_id', Integer, ForeignKey('design_types.design_type_id'))) + +inheritedPart = Table('inherited_part', engine, + Column('ip_id', Integer, primary_key=True), + Column('part_id', Integer, ForeignKey('parts.part_id')), + Column('design_id', Integer, ForeignKey('design.design_id')), + ) + +designType.create() +design.create() +part.create() +inheritedPart.create() + +assign_mapper(Part, part) + +assign_mapper(InheritedPart, inheritedPart, properties=dict( + part=relation(Part, lazy=False) +)) + +assign_mapper(Design, design, properties=dict( + parts=relation(Part, private=True, backref="design"), + inheritedParts=relation(InheritedPart, private=True, backref="design"), +)) + +assign_mapper(DesignType, designType, properties=dict( +# designs=relation(Design, private=True, backref="type"), +)) + +Design.mapper.add_property("type", relation(DesignType, lazy=False, backref="designs")) +Part.mapper.add_property("design", relation(Design, lazy=False, backref="parts")) +#Part.mapper.add_property("designType", relation(DesignType)) + +d = Design() +objectstore.commit() +objectstore.clear() +print "lets go !\n\n\n" +x = Design.get(1) +x.inheritedParts + + </ins></span></pre> </div> </div> </body> </html> |
