[Sqlalchemy-commits] [1175] sqlalchemy/trunk/lib/sqlalchemy: a few tweaks and the polymorph example
Brought to you by:
zzzeek
Menu
▾
▴
[Sqlalchemy-commits] [1175] sqlalchemy/trunk/lib/sqlalchemy: a few tweaks and the polymorph example can also use eager loading
|
From: <co...@sq...> - 2006-03-20 01:16:30
|
<!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>[1175] sqlalchemy/trunk/lib/sqlalchemy: a few tweaks and the polymorph example can also use eager loading</title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>1175</dd> <dt>Author</dt> <dd>zzzeek</dd> <dt>Date</dt> <dd>2006-03-19 19:16:16 -0600 (Sun, 19 Mar 2006)</dd> </dl> <h3>Log Message</h3> <pre>a few tweaks and the polymorph example can also use eager loading</pre> <h3>Modified Paths</h3> <ul> <li><a href="#sqlalchemytrunkexamplespolymorphpolymorphpy">sqlalchemy/trunk/examples/polymorph/polymorph.py</a></li> <li><a href="#sqlalchemytrunklibsqlalchemymappingpropertiespy">sqlalchemy/trunk/lib/sqlalchemy/mapping/properties.py</a></li> <li><a href="#sqlalchemytrunklibsqlalchemysqlpy">sqlalchemy/trunk/lib/sqlalchemy/sql.py</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="sqlalchemytrunkexamplespolymorphpolymorphpy"></a> <div class="modfile"><h4>Modified: sqlalchemy/trunk/examples/polymorph/polymorph.py (1174 => 1175)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/trunk/examples/polymorph/polymorph.py 2006-03-19 21:24:05 UTC (rev 1174) +++ sqlalchemy/trunk/examples/polymorph/polymorph.py 2006-03-20 01:16:16 UTC (rev 1175) </span><span class="lines">@@ -71,8 +71,8 @@ </span><span class="cx"> select( </span><span class="cx"> [people, engineers.c.description, column("'engineer'").label('type')], </span><span class="cx"> people.c.person_id==engineers.c.person_id)).alias('pjoin') </span><ins>+ </ins><span class="cx"> </span><del>- </del><span class="cx"> # lets print out what this Selectable looks like. The mapper is going to take the selectable and </span><span class="cx"> # Select off of it, with the flag "use_labels" which indicates to prefix column names with the table </span><span class="cx"> # name. So here is what our mapper will see: </span><span class="lines">@@ -106,7 +106,7 @@ </span><span class="cx"> # (translation: it'll work) </span><span class="cx"> # TODO: get the eager loading to work (the compound select alias doesnt like being aliased itself) </span><span class="cx"> assign_mapper(Company, companies, properties={ </span><del>- 'employees': relation(people_mapper, private=True) </del><ins>+ 'employees': relation(people_mapper, lazy=False, private=True) </ins><span class="cx"> }) </span><span class="cx"> </span><span class="cx"> c = Company(name='company1') </span></span></pre></div> <a id="sqlalchemytrunklibsqlalchemymappingpropertiespy"></a> <div class="modfile"><h4>Modified: sqlalchemy/trunk/lib/sqlalchemy/mapping/properties.py (1174 => 1175)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/trunk/lib/sqlalchemy/mapping/properties.py 2006-03-19 21:24:05 UTC (rev 1174) +++ sqlalchemy/trunk/lib/sqlalchemy/mapping/properties.py 2006-03-20 01:16:16 UTC (rev 1175) </span><span class="lines">@@ -785,10 +785,18 @@ </span><span class="cx"> </span><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><ins>+ # since the EagerLoader makes an Alias of its mapper's table, + # we translate the actual result columns back to what they + # would normally be into a "virtual row" which is passed to the child mapper. + # that way the mapper doesnt have to know about the modified column name + # (neither do any MapperExtensions). The row is keyed off the Column object + # (which is what mappers use) as well as its "label" (which might be what + # user-defined code is using) </ins><span class="cx"> fakerow = util.DictDecorator(row) </span><span class="cx"> for c in self.eagertarget.c: </span><span class="cx"> parent = self.target._get_col_by_original(c.original) </span><span class="cx"> fakerow[parent] = row[c] </span><ins>+ fakerow[parent._label] = row[c] </ins><span class="cx"> row = fakerow </span><span class="cx"> return self.mapper._instance(row, imap, result_list) </span><span class="cx"> </span></span></pre></div> <a id="sqlalchemytrunklibsqlalchemysqlpy"></a> <div class="modfile"><h4>Modified: sqlalchemy/trunk/lib/sqlalchemy/sql.py (1174 => 1175)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/trunk/lib/sqlalchemy/sql.py 2006-03-19 21:24:05 UTC (rev 1174) +++ sqlalchemy/trunk/lib/sqlalchemy/sql.py 2006-03-20 01:16:16 UTC (rev 1175) </span><span class="lines">@@ -1040,6 +1040,7 @@ </span><span class="cx"> return BindParamClause(self.table.name + "_" + self.text, obj, shortname = self.text, type=self.type) </span><span class="cx"> def _make_proxy(self, selectable, name = None): </span><span class="cx"> c = ColumnClause(name or self.text, selectable) </span><ins>+ c._original = self.original </ins><span class="cx"> selectable.columns[c.name] = c </span><span class="cx"> return c </span><span class="cx"> def _compare_type(self, obj): </span></span></pre> </div> </div> </body> </html> |
