[Sqlalchemy-commits] [1431] sqlalchemy/branches/schema/test: small edits
Brought to you by:
zzzeek
Menu
▾
▴
[Sqlalchemy-commits] [1431] sqlalchemy/branches/schema/test: small edits
|
From: <co...@sq...> - 2006-05-09 01:20:42
|
<!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>[1431] sqlalchemy/branches/schema/test: small edits</title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>1431</dd> <dt>Author</dt> <dd>zzzeek</dd> <dt>Date</dt> <dd>2006-05-08 20:20:33 -0500 (Mon, 08 May 2006)</dd> </dl> <h3>Log Message</h3> <pre>small edits</pre> <h3>Modified Paths</h3> <ul> <li><a href="#sqlalchemybranchesschemalibsqlalchemyormmapperpy">sqlalchemy/branches/schema/lib/sqlalchemy/orm/mapper.py</a></li> <li><a href="#sqlalchemybranchesschematestselectablepy">sqlalchemy/branches/schema/test/selectable.py</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="sqlalchemybranchesschemalibsqlalchemyormmapperpy"></a> <div class="modfile"><h4>Modified: sqlalchemy/branches/schema/lib/sqlalchemy/orm/mapper.py (1430 => 1431)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/branches/schema/lib/sqlalchemy/orm/mapper.py 2006-05-09 01:20:08 UTC (rev 1430) +++ sqlalchemy/branches/schema/lib/sqlalchemy/orm/mapper.py 2006-05-09 01:20:33 UTC (rev 1431) </span><span class="lines">@@ -466,7 +466,7 @@ </span><span class="cx"> def identity_key(self, primary_key): </span><span class="cx"> """returns the instance key for the given identity value. this is a global tracking object used by the Session, and is usually available off a mapped object as instance._instance_key.""" </span><span class="cx"> return sessionlib.get_id_key(util.to_list(primary_key), self.class_, self.entity_name) </span><del>- </del><ins>+ </ins><span class="cx"> def instance_key(self, instance): </span><span class="cx"> """returns the instance key for the given instance. this is a global tracking object used by the Session, and is usually available off a mapped object as instance._instance_key.""" </span><span class="cx"> return self.identity_key(self.identity(instance)) </span><span class="lines">@@ -486,8 +486,7 @@ </span><span class="cx"> mapper.__dict__.update(kwargs) </span><span class="cx"> mapper.props = self.props.copy() </span><span class="cx"> return mapper </span><del>- - </del><ins>+ </ins><span class="cx"> def options(self, *options, **kwargs): </span><span class="cx"> """uses this mapper as a prototype for a new mapper with different behavior. </span><span class="cx"> *options is a list of options directives, which include eagerload(), lazyload(), and noload()""" </span><span class="lines">@@ -835,9 +834,7 @@ </span><span class="cx"> </span><span class="cx"> def translate_row(self, tomapper, row): </span><span class="cx"> """attempts to take a row and translate its values to a row that can </span><del>- be understood by another mapper. breaks the column references down to their - bare keynames to accomplish this. So far this works for the various polymorphic - examples.""" </del><ins>+ be understood by another mapper.""" </ins><span class="cx"> newrow = util.DictDecorator(row) </span><span class="cx"> for c in tomapper.select_table.c: </span><span class="cx"> c2 = self.select_table.corresponding_column(c) </span><span class="lines">@@ -847,7 +844,6 @@ </span><span class="cx"> def populate_instance(self, session, instance, row, identitykey, imap, isnew, frommapper=None): </span><span class="cx"> if frommapper is not None: </span><span class="cx"> row = frommapper.translate_row(self, row) </span><del>- </del><span class="cx"> for prop in self.props.values(): </span><span class="cx"> prop.execute(session, instance, row, identitykey, imap, isnew) </span><span class="cx"> </span></span></pre></div> <a id="sqlalchemybranchesschematestselectablepy"></a> <div class="modfile"><h4>Modified: sqlalchemy/branches/schema/test/selectable.py (1430 => 1431)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/branches/schema/test/selectable.py 2006-05-09 01:20:08 UTC (rev 1430) +++ sqlalchemy/branches/schema/test/selectable.py 2006-05-09 01:20:33 UTC (rev 1431) </span><span class="lines">@@ -59,11 +59,10 @@ </span><span class="cx"> ).alias('analias') </span><span class="cx"> s1 = table.select(use_labels=True) </span><span class="cx"> s2 = table2.select(use_labels=True) </span><del>- print ["%d %s" % (id(c),c.key) for c in u.c] -# c = u.corresponding_column(s1.c.table1_col2) - print "%d %s" % (id(c), c.key) </del><span class="cx"> assert u.corresponding_column(s1.c.table1_col2) is u.c.col2 </span><span class="cx"> assert u.corresponding_column(s2.c.table2_col2) is u.c.col2 </span><ins>+ assert u.corresponding_column(s2.c.table2_coly) is u.c.coly + assert s2.corresponding_column(u.c.coly) is s2.c.table2_coly </ins><span class="cx"> </span><span class="cx"> def testselectunion(self): </span><span class="cx"> # like testaliasunion, but off a Select off the union. </span></span></pre> </div> </div> </body> </html> |
