[Sqlalchemy-commits] [1333] sqlalchemy/branches/schema/test: merged fix from 1331->1332 into 0.2
Brought to you by:
zzzeek
Menu
▾
▴
[Sqlalchemy-commits] [1333] sqlalchemy/branches/schema/test: merged fix from 1331->1332 into 0.2
|
From: <co...@sq...> - 2006-04-24 19:31:36
|
<!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>[1333] sqlalchemy/branches/schema/test: merged fix from 1331->1332 into 0.2</title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>1333</dd> <dt>Author</dt> <dd>zzzeek</dd> <dt>Date</dt> <dd>2006-04-24 14:31:23 -0500 (Mon, 24 Apr 2006)</dd> </dl> <h3>Log Message</h3> <pre>merged fix from 1331->1332 into 0.2</pre> <h3>Modified Paths</h3> <ul> <li><a href="#sqlalchemybranchesschemalibsqlalchemyormpropertiespy">sqlalchemy/branches/schema/lib/sqlalchemy/orm/properties.py</a></li> <li><a href="#sqlalchemybranchesschematestalltestspy">sqlalchemy/branches/schema/test/alltests.py</a></li> </ul> <h3>Added Paths</h3> <ul> <li><a href="#sqlalchemybranchesschematestlazytest1py">sqlalchemy/branches/schema/test/lazytest1.py</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="sqlalchemybranchesschemalibsqlalchemyormpropertiespy"></a> <div class="modfile"><h4>Modified: sqlalchemy/branches/schema/lib/sqlalchemy/orm/properties.py (1332 => 1333)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/branches/schema/lib/sqlalchemy/orm/properties.py 2006-04-24 19:21:12 UTC (rev 1332) +++ sqlalchemy/branches/schema/lib/sqlalchemy/orm/properties.py 2006-04-24 19:31:23 UTC (rev 1333) </span><span class="lines">@@ -20,7 +20,7 @@ </span><span class="cx"> import dependency </span><span class="cx"> import util as mapperutil </span><span class="cx"> from sqlalchemy.exceptions import * </span><del>-import sets </del><ins>+import sets, random </ins><span class="cx"> </span><span class="cx"> class ColumnProperty(MapperProperty): </span><span class="cx"> """describes an object attribute that corresponds to a table column.""" </span><span class="lines">@@ -359,7 +359,7 @@ </span><span class="cx"> </span><span class="cx"> class LazyLoader(PropertyLoader): </span><span class="cx"> def do_init_subclass(self, key, parent): </span><del>- (self.lazywhere, self.lazybinds) = create_lazy_clause(self.parent.noninherited_table, self.primaryjoin, self.secondaryjoin, self.foreignkey) </del><ins>+ (self.lazywhere, self.lazybinds, self.lazyreverse) = create_lazy_clause(self.parent.noninherited_table, self.primaryjoin, self.secondaryjoin, self.foreignkey) </ins><span class="cx"> # determine if our "lazywhere" clause is the same as the mapper's </span><span class="cx"> # get() clause. then we can just use mapper.get() </span><span class="cx"> self.use_get = not self.uselist and self.mapper.query()._get_clause.compare(self.lazywhere) </span><span class="lines">@@ -388,7 +388,8 @@ </span><span class="cx"> if self.use_get: </span><span class="cx"> ident = [] </span><span class="cx"> for primary_key in self.mapper.pks_by_table[self.mapper.table]: </span><del>- ident.append(params[primary_key._label]) </del><ins>+ bind = self.lazyreverse[primary_key] + ident.append(params[bind.key]) </ins><span class="cx"> return self.mapper.using(session).get(*ident) </span><span class="cx"> elif self.order_by is not False: </span><span class="cx"> order_by = self.order_by </span><span class="lines">@@ -426,23 +427,31 @@ </span><span class="cx"> </span><span class="cx"> def create_lazy_clause(table, primaryjoin, secondaryjoin, foreignkey): </span><span class="cx"> binds = {} </span><ins>+ reverse = {} + def bind_label(): + return "lazy_" + hex(random.randint(0, 65535))[2:] + </ins><span class="cx"> def visit_binary(binary): </span><span class="cx"> circular = isinstance(binary.left, schema.Column) and isinstance(binary.right, schema.Column) and binary.left.table is binary.right.table </span><span class="cx"> if isinstance(binary.left, schema.Column) and isinstance(binary.right, schema.Column) and ((not circular and binary.left.table is table) or (circular and binary.right is foreignkey)): </span><ins>+ col = binary.left </ins><span class="cx"> binary.left = binds.setdefault(binary.left, </span><del>- sql.BindParamClause(binary.right._label, None, shortname = binary.left.name)) </del><ins>+ sql.BindParamClause(bind_label(), None, shortname = binary.left.name)) + reverse[binary.right] = binds[col] </ins><span class="cx"> binary.swap() </span><span class="cx"> </span><span class="cx"> if isinstance(binary.right, schema.Column) and isinstance(binary.left, schema.Column) and ((not circular and binary.right.table is table) or (circular and binary.left is foreignkey)): </span><ins>+ col = binary.right </ins><span class="cx"> binary.right = binds.setdefault(binary.right, </span><del>- sql.BindParamClause(binary.left._label, None, shortname = binary.right.name)) - </del><ins>+ sql.BindParamClause(bind_label(), None, shortname = binary.right.name)) + reverse[binary.left] = binds[col] + </ins><span class="cx"> lazywhere = primaryjoin.copy_container() </span><span class="cx"> li = BinaryVisitor(visit_binary) </span><span class="cx"> lazywhere.accept_visitor(li) </span><span class="cx"> if secondaryjoin is not None: </span><span class="cx"> lazywhere = sql.and_(lazywhere, secondaryjoin) </span><del>- return (lazywhere, binds) </del><ins>+ return (lazywhere, binds, reverse) </ins><span class="cx"> </span><span class="cx"> </span><span class="cx"> class EagerLoader(PropertyLoader): </span></span></pre></div> <a id="sqlalchemybranchesschematestalltestspy"></a> <div class="modfile"><h4>Modified: sqlalchemy/branches/schema/test/alltests.py (1332 => 1333)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/branches/schema/test/alltests.py 2006-04-24 19:21:12 UTC (rev 1332) +++ sqlalchemy/branches/schema/test/alltests.py 2006-04-24 19:31:23 UTC (rev 1333) </span><span class="lines">@@ -34,6 +34,7 @@ </span><span class="cx"> # ORM selecting </span><span class="cx"> 'mapper', </span><span class="cx"> 'selectresults', </span><ins>+ 'lazytest1', </ins><span class="cx"> 'eagertest1', </span><span class="cx"> 'eagertest2', </span><span class="cx"> </span></span></pre></div> <a id="sqlalchemybranchesschematestlazytest1pyfromrev1332sqlalchemytrunktestlazytest1py"></a> <div class="copfile"><h4>Copied: sqlalchemy/branches/schema/test/lazytest1.py (from rev 1332, sqlalchemy/trunk/test/lazytest1.py) ( => )</h4> <pre class="diff"><span> <span class="info"> </span></span></pre> </div> </div> </body> </html> |
