[Sqlalchemy-commits] [1212] sqlalchemy/trunk/examples/polymorph: improved translation of rows when p
Brought to you by:
zzzeek
Menu
▾
▴
[Sqlalchemy-commits] [1212] sqlalchemy/trunk/examples/polymorph: improved translation of rows when proxying rows from one mapper to another.
|
From: <co...@sq...> - 2006-03-26 07:21:38
|
<!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>[1212] sqlalchemy/trunk/examples/polymorph: improved translation of rows when proxying rows from one mapper to another.</title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>1212</dd> <dt>Author</dt> <dd>zzzeek</dd> <dt>Date</dt> <dd>2006-03-26 01:21:28 -0600 (Sun, 26 Mar 2006)</dd> </dl> <h3>Log Message</h3> <pre>improved translation of rows when proxying rows from one mapper to another.</pre> <h3>Modified Paths</h3> <ul> <li><a href="#sqlalchemytrunkexamplespolymorphpolymorph2py">sqlalchemy/trunk/examples/polymorph/polymorph2.py</a></li> <li><a href="#sqlalchemytrunklibsqlalchemymappingmapperpy">sqlalchemy/trunk/lib/sqlalchemy/mapping/mapper.py</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="sqlalchemytrunkexamplespolymorphpolymorph2py"></a> <div class="modfile"><h4>Modified: sqlalchemy/trunk/examples/polymorph/polymorph2.py (1211 => 1212)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/trunk/examples/polymorph/polymorph2.py 2006-03-26 06:30:21 UTC (rev 1211) +++ sqlalchemy/trunk/examples/polymorph/polymorph2.py 2006-03-26 07:21:28 UTC (rev 1212) </span><span class="lines">@@ -73,7 +73,8 @@ </span><span class="cx"> column("'engineer'").label('type') </span><span class="cx"> ], </span><span class="cx"> people.c.person_id==engineers.c.person_id)).alias('pjoin') </span><del>- </del><ins>+ +print [c for c in person_join.c] </ins><span class="cx"> </span><span class="cx"> # MapperExtension object. </span><span class="cx"> class PersonLoader(MapperExtension): </span><span class="lines">@@ -87,10 +88,10 @@ </span><span class="cx"> </span><span class="cx"> def populate_instance(self, mapper, instance, row, identitykey, imap, isnew): </span><span class="cx"> if row[person_join.c.type] =='engineer': </span><del>- Engineer.mapper.populate_instance(instance, row, identitykey, imap, isnew) </del><ins>+ Engineer.mapper.populate_instance(instance, row, identitykey, imap, isnew, frommapper=mapper) </ins><span class="cx"> return False </span><span class="cx"> elif row[person_join.c.type] =='manager': </span><del>- Manager.mapper.populate_instance(instance, row, identitykey, imap, isnew) </del><ins>+ Manager.mapper.populate_instance(instance, row, identitykey, imap, isnew, frommapper=mapper) </ins><span class="cx"> return False </span><span class="cx"> else: </span><span class="cx"> return True </span></span></pre></div> <a id="sqlalchemytrunklibsqlalchemymappingmapperpy"></a> <div class="modfile"><h4>Modified: sqlalchemy/trunk/lib/sqlalchemy/mapping/mapper.py (1211 => 1212)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/trunk/lib/sqlalchemy/mapping/mapper.py 2006-03-26 06:30:21 UTC (rev 1211) +++ sqlalchemy/trunk/lib/sqlalchemy/mapping/mapper.py 2006-03-26 07:21:28 UTC (rev 1212) </span><span class="lines">@@ -854,19 +854,27 @@ </span><span class="cx"> # call further mapper properties on the row, to pull further </span><span class="cx"> # instances from the row and possibly populate this item. </span><span class="cx"> if self.extension.populate_instance(self, instance, row, identitykey, imap, isnew): </span><del>- self.populate_instance(instance, row, identitykey, imap, isnew, translate=False) </del><ins>+ self.populate_instance(instance, row, identitykey, imap, isnew) </ins><span class="cx"> if self.extension.append_result(self, row, imap, result, instance, isnew, populate_existing=populate_existing): </span><span class="cx"> if result is not None: </span><span class="cx"> result.append_nohistory(instance) </span><span class="cx"> return instance </span><span class="cx"> </span><del>- def populate_instance(self, instance, row, identitykey, imap, isnew, translate=True): - if translate: - newrow = {} - for table in self.tables: - for c in table.c: - newrow[c] = row[c.key] - row = newrow </del><ins>+ def translate_row(self, tomapper, row): + """attempts to take a row and translate its values to a row that can + 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.""" + newrow = util.DictDecorator(row) + for c in self.table.c: + newrow[c.key] = row[c] + for c in tomapper.table.c: + newrow[c] = newrow[c.key] + return newrow + + def populate_instance(self, instance, row, identitykey, imap, isnew, frommapper=None): + if frommapper is not None: + row = frommapper.translate_row(self, row) </ins><span class="cx"> </span><span class="cx"> for prop in self.props.values(): </span><span class="cx"> prop.execute(instance, row, identitykey, imap, isnew) </span></span></pre> </div> </div> </body> </html> |
