[Sqlalchemy-commits] [1248] sqlalchemy/trunk/lib/sqlalchemy/sql.py: ack, fixes to the order by stuff
Brought to you by:
zzzeek
Menu
▾
▴
[Sqlalchemy-commits] [1248] sqlalchemy/trunk/lib/sqlalchemy/sql.py: ack, fixes to the order by stuff from last night
|
From: <co...@sq...> - 2006-04-03 17:46:28
|
<!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>[1248] sqlalchemy/trunk/lib/sqlalchemy/sql.py: ack, fixes to the order by stuff from last night</title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>1248</dd> <dt>Author</dt> <dd>zzzeek</dd> <dt>Date</dt> <dd>2006-04-03 12:46:08 -0500 (Mon, 03 Apr 2006)</dd> </dl> <h3>Log Message</h3> <pre>ack, fixes to the order by stuff from last night</pre> <h3>Modified Paths</h3> <ul> <li><a href="#sqlalchemytrunklibsqlalchemysqlpy">sqlalchemy/trunk/lib/sqlalchemy/sql.py</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="sqlalchemytrunklibsqlalchemysqlpy"></a> <div class="modfile"><h4>Modified: sqlalchemy/trunk/lib/sqlalchemy/sql.py (1247 => 1248)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/trunk/lib/sqlalchemy/sql.py 2006-04-03 17:13:42 UTC (rev 1247) +++ sqlalchemy/trunk/lib/sqlalchemy/sql.py 2006-04-03 17:46:08 UTC (rev 1248) </span><span class="lines">@@ -1145,14 +1145,14 @@ </span><span class="cx"> class SelectBaseMixin(object): </span><span class="cx"> """base class for Select and CompoundSelects""" </span><span class="cx"> def order_by(self, *clauses): </span><del>- if clauses[0] is None: </del><ins>+ if len(clauses) == 0 or clauses[0] is None: </ins><span class="cx"> self.order_by_clause = ClauseList() </span><span class="cx"> elif getattr(self, 'order_by_clause', None): </span><del>- self.order_by_clause = ClauseList(*(list(clauses)+list(self.order_by_clause.clauses))) </del><ins>+ self.order_by_clause = ClauseList(*(list(self.order_by_clause.clauses) + list(clauses))) </ins><span class="cx"> else: </span><span class="cx"> self.order_by_clause = ClauseList(*clauses) </span><span class="cx"> def group_by(self, *clauses): </span><del>- if clauses[0] is None: </del><ins>+ if len(clauses) == 0 or clauses[0] is None: </ins><span class="cx"> self.group_by_clause = ClauseList() </span><span class="cx"> elif getattr(self, 'group_by_clause', None): </span><span class="cx"> self.group_by_clause = ClauseList(*(list(clauses)+list(self.group_by_clause.clauses))) </span></span></pre> </div> </div> </body> </html> |
