[Sqlalchemy-commits] [1397] sqlalchemy/trunk/lib/sqlalchemy/mapping/query.py: added from_obj option
Brought to you by:
zzzeek
Menu
▾
▴
[Sqlalchemy-commits] [1397] sqlalchemy/trunk/lib/sqlalchemy/mapping/query.py: added from_obj option to select()
|
From: <co...@sq...> - 2006-05-05 01:19:05
|
<!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>[1397] sqlalchemy/trunk/lib/sqlalchemy/mapping/query.py: added from_obj option to select()</title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>1397</dd> <dt>Author</dt> <dd>zzzeek</dd> <dt>Date</dt> <dd>2006-05-04 20:18:55 -0500 (Thu, 04 May 2006)</dd> </dl> <h3>Log Message</h3> <pre>added from_obj option to select()</pre> <h3>Modified Paths</h3> <ul> <li><a href="#sqlalchemytrunklibsqlalchemymappingquerypy">sqlalchemy/trunk/lib/sqlalchemy/mapping/query.py</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="sqlalchemytrunklibsqlalchemymappingquerypy"></a> <div class="modfile"><h4>Modified: sqlalchemy/trunk/lib/sqlalchemy/mapping/query.py (1396 => 1397)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/trunk/lib/sqlalchemy/mapping/query.py 2006-05-05 00:58:13 UTC (rev 1396) +++ sqlalchemy/trunk/lib/sqlalchemy/mapping/query.py 2006-05-05 01:18:55 UTC (rev 1397) </span><span class="lines">@@ -223,14 +223,16 @@ </span><span class="cx"> </span><span class="cx"> def _compile(self, whereclause = None, **kwargs): </span><span class="cx"> order_by = kwargs.pop('order_by', False) </span><ins>+ from_obj = kwargs.pop('from_obj', []) </ins><span class="cx"> if order_by is False: </span><span class="cx"> order_by = self.order_by </span><span class="cx"> if order_by is False: </span><span class="cx"> if self.table.default_order_by() is not None: </span><span class="cx"> order_by = self.table.default_order_by() </span><del>- </del><ins>+ </ins><span class="cx"> if self._should_nest(**kwargs): </span><del>- s2 = sql.select(self.table.primary_key, whereclause, use_labels=True, from_obj=[self.table], **kwargs) </del><ins>+ from_obj.append(self.table) + s2 = sql.select(self.table.primary_key, whereclause, use_labels=True, from_obj=from_obj, **kwargs) </ins><span class="cx"> # raise "ok first thing", str(s2) </span><span class="cx"> if not kwargs.get('distinct', False) and order_by: </span><span class="cx"> s2.order_by(*util.to_list(order_by)) </span><span class="lines">@@ -243,7 +245,8 @@ </span><span class="cx"> if order_by: </span><span class="cx"> statement.order_by(*util.to_list(order_by)) </span><span class="cx"> else: </span><del>- statement = sql.select([], whereclause, from_obj=[self.table], use_labels=True, **kwargs) </del><ins>+ from_obj.append(self.table) + statement = sql.select([], whereclause, from_obj=from_obj, use_labels=True, **kwargs) </ins><span class="cx"> if order_by: </span><span class="cx"> statement.order_by(*util.to_list(order_by)) </span><span class="cx"> # for a DISTINCT query, you need the columns explicitly specified in order </span></span></pre> </div> </div> </body> </html> |
