[Sqlalchemy-commits] [1176] sqlalchemy/trunk/lib/sqlalchemy/mapping/properties.py: a refactoring to
Brought to you by:
zzzeek
Menu
▾
▴
[Sqlalchemy-commits] [1176] sqlalchemy/trunk/lib/sqlalchemy/mapping/properties.py: a refactoring to the EagerLoaders' _instance method to do a bunch of column arithmetic up front, instead of on each row
<!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>[1176] sqlalchemy/trunk/lib/sqlalchemy/mapping/properties.py: a refactoring to the EagerLoaders' _instance method to do a bunch of column arithmetic up front, instead of on each row</title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>1176</dd> <dt>Author</dt> <dd>zzzeek</dd> <dt>Date</dt> <dd>2006-03-20 20:43:58 -0600 (Mon, 20 Mar 2006)</dd> </dl> <h3>Log Message</h3> <pre>a refactoring to the EagerLoaders' _instance method to do a bunch of column arithmetic up front, instead of on each row</pre> <h3>Modified Paths</h3> <ul> <li><a href="#sqlalchemytrunklibsqlalchemymappingpropertiespy">sqlalchemy/trunk/lib/sqlalchemy/mapping/properties.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 (1175 => 1176)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/trunk/lib/sqlalchemy/mapping/properties.py 2006-03-20 01:16:16 UTC (rev 1175) +++ sqlalchemy/trunk/lib/sqlalchemy/mapping/properties.py 2006-03-21 02:43:58 UTC (rev 1176) </span><span class="lines">@@ -758,6 +758,8 @@ </span><span class="cx"> for key, value in self.mapper.props.iteritems(): </span><span class="cx"> value.setup(key, statement, eagertable=self.eagertarget) </span><span class="cx"> </span><ins>+ self._decorator_row = self._create_decorator_row() + </ins><span class="cx"> def execute(self, instance, row, identitykey, imap, isnew): </span><span class="cx"> """receive a row. tell our mapper to look for a new object instance in the row, and attach </span><span class="cx"> it to a list on the parent instance.""" </span><span class="lines">@@ -783,6 +785,21 @@ </span><span class="cx"> </span><span class="cx"> self._instance(row, imap, result_list) </span><span class="cx"> </span><ins>+ def _create_decorator_row(self): + class DecoratorDict(object): + def __init__(self, row): + self.row = row + def __getitem__(self, key): + if map.has_key(key): + key = map[key] + return self.row[key] + map = {} + for c in self.eagertarget.c: + parent = self.target._get_col_by_original(c.original) + map[parent] = c + map[parent._label] = c + return DecoratorDict + </ins><span class="cx"> def _instance(self, row, imap, result_list=None): </span><span class="cx"> """gets an instance from a row, via this EagerLoader's mapper.""" </span><span class="cx"> # since the EagerLoader makes an Alias of its mapper's table, </span><span class="lines">@@ -792,12 +809,7 @@ </span><span class="cx"> # (neither do any MapperExtensions). The row is keyed off the Column object </span><span class="cx"> # (which is what mappers use) as well as its "label" (which might be what </span><span class="cx"> # user-defined code is using) </span><del>- fakerow = util.DictDecorator(row) - for c in self.eagertarget.c: - parent = self.target._get_col_by_original(c.original) - fakerow[parent] = row[c] - fakerow[parent._label] = row[c] - row = fakerow </del><ins>+ row = self._decorator_row(row) </ins><span class="cx"> return self.mapper._instance(row, imap, result_list) </span><span class="cx"> </span><span class="cx"> class GenericOption(MapperOption): </span></span></pre> </div> </div> </body> </html> |
