[Sqlalchemy-commits] [1379] sqlalchemy/trunk/lib/sqlalchemy/mapping: "order_by" parameter propigated
Brought to you by:
zzzeek
Menu
▾
▴
[Sqlalchemy-commits] [1379] sqlalchemy/trunk/lib/sqlalchemy/mapping: "order_by" parameter propigated to inheriting mappers
|
From: <co...@sq...> - 2006-05-03 16:56:07
|
<!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>[1379] sqlalchemy/trunk/lib/sqlalchemy/mapping: "order_by" parameter propigated to inheriting mappers</title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>1379</dd> <dt>Author</dt> <dd>zzzeek</dd> <dt>Date</dt> <dd>2006-05-03 11:55:56 -0500 (Wed, 03 May 2006)</dd> </dl> <h3>Log Message</h3> <pre>"order_by" parameter propigated to inheriting mappers oracle ROW_NUMBER logic uses select.oid_column to get default order by</pre> <h3>Modified Paths</h3> <ul> <li><a href="#sqlalchemytrunklibsqlalchemydatabasesoraclepy">sqlalchemy/trunk/lib/sqlalchemy/databases/oracle.py</a></li> <li><a href="#sqlalchemytrunklibsqlalchemymappingmapperpy">sqlalchemy/trunk/lib/sqlalchemy/mapping/mapper.py</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="sqlalchemytrunklibsqlalchemydatabasesoraclepy"></a> <div class="modfile"><h4>Modified: sqlalchemy/trunk/lib/sqlalchemy/databases/oracle.py (1378 => 1379)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/trunk/lib/sqlalchemy/databases/oracle.py 2006-05-03 15:53:45 UTC (rev 1378) +++ sqlalchemy/trunk/lib/sqlalchemy/databases/oracle.py 2006-05-03 16:55:56 UTC (rev 1379) </span><span class="lines">@@ -276,16 +276,10 @@ </span><span class="cx"> return </span><span class="cx"> if select.limit is not None or select.offset is not None: </span><span class="cx"> select._oracle_visit = True </span><ins>+ # to use ROW_NUMBER(), an ORDER BY is required. </ins><span class="cx"> orderby = self.strings[select.order_by_clause] </span><span class="cx"> if not orderby: </span><del>- # to use ROW_NUMBER(), an ORDER BY is required. so here we dig in - # as best we can to find some column we can order by - # TODO: try to get "oid_column" to be used here - if len(select.primary_key): - col = select.primary_key[0].original.table.name - else: - col = [c for c in select.c][0].original.table.name - orderby = "%s.rowid ASC" % col </del><ins>+ orderby = select.oid_column </ins><span class="cx"> select.append_column(sql.ColumnClause("ROW_NUMBER() OVER (ORDER BY %s)" % orderby).label("ora_rn")) </span><span class="cx"> limitselect = sql.select([c for c in select.c if c.key!='ora_rn']) </span><span class="cx"> if select.offset is not None: </span></span></pre></div> <a id="sqlalchemytrunklibsqlalchemymappingmapperpy"></a> <div class="modfile"><h4>Modified: sqlalchemy/trunk/lib/sqlalchemy/mapping/mapper.py (1378 => 1379)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/trunk/lib/sqlalchemy/mapping/mapper.py 2006-05-03 15:53:45 UTC (rev 1378) +++ sqlalchemy/trunk/lib/sqlalchemy/mapping/mapper.py 2006-05-03 16:55:56 UTC (rev 1379) </span><span class="lines">@@ -114,6 +114,8 @@ </span><span class="cx"> self._synchronizer = None </span><span class="cx"> self.inherits = inherits </span><span class="cx"> self.noninherited_table = table </span><ins>+ if self.order_by is False: + self.order_by = inherits.order_by </ins><span class="cx"> else: </span><span class="cx"> self.primarytable = self.table </span><span class="cx"> self.noninherited_table = self.table </span></span></pre> </div> </div> </body> </html> |
