[Sqlalchemy-commits] [1508] sqlalchemy/trunk/lib/sqlalchemy/orm/query.py: workaround for get that re
Brought to you by:
zzzeek
From: <co...@sq...> - 2006-05-25 15:17:16
|
<!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>[1508] sqlalchemy/trunk/lib/sqlalchemy/orm/query.py: workaround for get that requires multiple ids in the case of joined table inheritance</title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>1508</dd> <dt>Author</dt> <dd>zzzeek</dd> <dt>Date</dt> <dd>2006-05-25 10:02:59 -0500 (Thu, 25 May 2006)</dd> </dl> <h3>Log Message</h3> <pre>workaround for get that requires multiple ids in the case of joined table inheritance</pre> <h3>Modified Paths</h3> <ul> <li><a href="#sqlalchemytrunklibsqlalchemyormquerypy">sqlalchemy/trunk/lib/sqlalchemy/orm/query.py</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="sqlalchemytrunklibsqlalchemyormquerypy"></a> <div class="modfile"><h4>Modified: sqlalchemy/trunk/lib/sqlalchemy/orm/query.py (1507 => 1508)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/trunk/lib/sqlalchemy/orm/query.py 2006-05-25 14:48:32 UTC (rev 1507) +++ sqlalchemy/trunk/lib/sqlalchemy/orm/query.py 2006-05-25 15:02:59 UTC (rev 1508) </span><span class="lines">@@ -267,7 +267,13 @@ </span><span class="cx"> params = {} </span><span class="cx"> for primary_key in self.mapper.pks_by_table[self.table]: </span><span class="cx"> params["pk_"+primary_key.key] = ident[i] </span><del>- i += 1 </del><ins>+ # if there are not enough elements in the given identifier, then + # use the previous identifier repeatedly. this is a workaround for the issue + # in [ticket:185], where a mapper that uses joined table inheritance needs to specify + # all primary keys of the joined relationship, which includes even if the join is joining + # two primary key (and therefore synonymous) columns together, the usual case for joined table inheritance. + if len(ident) > i + 1: + i += 1 </ins><span class="cx"> try: </span><span class="cx"> statement = self._compile(self._get_clause) </span><span class="cx"> return self._select_statement(statement, params=params, populate_existing=reload)[0] </span></span></pre> </div> </div> </body> </html> |