[Sqlalchemy-commits] [1469] sqlalchemy/branches/schema/lib/sqlalchemy/orm/util.py: adjustment to inc
Brought to you by:
zzzeek
<!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>[1469] sqlalchemy/branches/schema/lib/sqlalchemy/orm/util.py: adjustment to incoming Select statements on polymorphic_union, to "aliasize" them automatically</title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>1469</dd> <dt>Author</dt> <dd>zzzeek</dd> <dt>Date</dt> <dd>2006-05-17 10:32:05 -0500 (Wed, 17 May 2006)</dd> </dl> <h3>Log Message</h3> <pre>adjustment to incoming Select statements on polymorphic_union, to "aliasize" them automatically</pre> <h3>Modified Paths</h3> <ul> <li><a href="#sqlalchemybranchesschemalibsqlalchemyormutilpy">sqlalchemy/branches/schema/lib/sqlalchemy/orm/util.py</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="sqlalchemybranchesschemalibsqlalchemyormutilpy"></a> <div class="modfile"><h4>Modified: sqlalchemy/branches/schema/lib/sqlalchemy/orm/util.py (1468 => 1469)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/branches/schema/lib/sqlalchemy/orm/util.py 2006-05-17 01:16:16 UTC (rev 1468) +++ sqlalchemy/branches/schema/lib/sqlalchemy/orm/util.py 2006-05-17 15:32:05 UTC (rev 1469) </span><span class="lines">@@ -24,7 +24,15 @@ </span><span class="cx"> def polymorphic_union(table_map, typecolname, aliasname='p_union'): </span><span class="cx"> colnames = sets.Set() </span><span class="cx"> colnamemaps = {} </span><del>- for table in table_map.values(): </del><ins>+ + for key in table_map.keys(): + table = table_map[key] + + # mysql doesnt like selecting from a select; make it an alias of the select + if isinstance(table, sql.Select): + table = table.alias() + table_map[key] = table + </ins><span class="cx"> m = {} </span><span class="cx"> for c in table.c: </span><span class="cx"> colnames.add(c.name) </span></span></pre> </div> </div> </body> </html> |