[Sqlalchemy-commits] [1187] sqlalchemy/trunk/test: some adjustments to oracle non-ansi join concaten
Brought to you by:
zzzeek
Menu
▾
▴
[Sqlalchemy-commits] [1187] sqlalchemy/trunk/test: some adjustments to oracle non-ansi join concatenation, 'row number over' syntax
|
From: <co...@sq...> - 2006-03-23 06:17:49
|
<!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>[1187] sqlalchemy/trunk/test: some adjustments to oracle non-ansi join concatenation, 'row number over' syntax</title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>1187</dd> <dt>Author</dt> <dd>zzzeek</dd> <dt>Date</dt> <dd>2006-03-23 00:17:29 -0600 (Thu, 23 Mar 2006)</dd> </dl> <h3>Log Message</h3> <pre>some adjustments to oracle non-ansi join concatenation, 'row number over' syntax</pre> <h3>Modified Paths</h3> <ul> <li><a href="#sqlalchemytrunklibsqlalchemydatabasesoraclepy">sqlalchemy/trunk/lib/sqlalchemy/databases/oracle.py</a></li> <li><a href="#sqlalchemytrunktestselectpy">sqlalchemy/trunk/test/select.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 (1186 => 1187)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/trunk/lib/sqlalchemy/databases/oracle.py 2006-03-22 21:25:10 UTC (rev 1186) +++ sqlalchemy/trunk/lib/sqlalchemy/databases/oracle.py 2006-03-23 06:17:29 UTC (rev 1187) </span><span class="lines">@@ -227,9 +227,9 @@ </span><span class="cx"> def visit_join(self, join): </span><span class="cx"> if self._use_ansi: </span><span class="cx"> return ansisql.ANSICompiler.visit_join(self, join) </span><del>- </del><ins>+ </ins><span class="cx"> self.froms[join] = self.get_from_text(join.left) + ", " + self.get_from_text(join.right) </span><del>- self.wheres[join] = join.onclause </del><ins>+ self.wheres[join] = sql.and_(self.wheres.get(join.left, None), join.onclause) </ins><span class="cx"> </span><span class="cx"> if join.isouter: </span><span class="cx"> # if outer join, push on the right side table as the current "outertable" </span><span class="lines">@@ -241,6 +241,8 @@ </span><span class="cx"> join.onclause.accept_visitor(self) </span><span class="cx"> </span><span class="cx"> self._outertable = outertable </span><ins>+ + self.visit_compound(self.wheres[join]) </ins><span class="cx"> </span><span class="cx"> def visit_alias(self, alias): </span><span class="cx"> """oracle doesnt like 'FROM table AS alias'. is the AS standard SQL??""" </span><span class="lines">@@ -250,7 +252,7 @@ </span><span class="cx"> def visit_column(self, column): </span><span class="cx"> if self._use_ansi: </span><span class="cx"> return ansisql.ANSICompiler.visit_column(self, column) </span><del>- </del><ins>+ </ins><span class="cx"> if column.table is self._outertable: </span><span class="cx"> self.strings[column] = "%s.%s(+)" % (column.table.name, column.name) </span><span class="cx"> else: </span><span class="lines">@@ -285,7 +287,11 @@ </span><span class="cx"> # to use ROW_NUMBER(), an ORDER BY is required. so here we dig in </span><span class="cx"> # as best we can to find some column we can order by </span><span class="cx"> # TODO: try to get "oid_column" to be used here </span><del>- orderby = "%s.rowid ASC" % select.primary_key[0].original.table.name </del><ins>+ if len(select.primary_key): + col = select.primary_key[0].original.table.name + else: + col = select.froms[0].name + orderby = "%s.rowid ASC" % col </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="sqlalchemytrunktestselectpy"></a> <div class="modfile"><h4>Modified: sqlalchemy/trunk/test/select.py (1186 => 1187)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/trunk/test/select.py 2006-03-22 21:25:10 UTC (rev 1186) +++ sqlalchemy/trunk/test/select.py 2006-03-23 06:17:29 UTC (rev 1187) </span><span class="lines">@@ -463,6 +463,10 @@ </span><span class="cx"> myothertable.othername != :myothertable_othername AND EXISTS (select yay from foo where boo = lar)", </span><span class="cx"> engine = oracle.engine({}, use_ansi = False)) </span><span class="cx"> </span><ins>+ query = table1.outerjoin(table2, table1.c.myid==table2.c.otherid).outerjoin(table3, table3.c.userid==table2.c.otherid) + self.runtest(query.select(), "SELECT mytable.myid, mytable.name, mytable.description, myothertable.otherid, myothertable.othername, thirdtable.userid, thirdtable.otherstuff FROM mytable LEFT OUTER JOIN myothertable ON mytable.myid = myothertable.otherid LEFT OUTER JOIN thirdtable ON thirdtable.userid = myothertable.otherid") + self.runtest(query.select(), "SELECT mytable.myid, mytable.name, mytable.description, myothertable.otherid, myothertable.othername, thirdtable.userid, thirdtable.otherstuff FROM mytable, myothertable, thirdtable WHERE mytable.myid = myothertable.otherid(+) AND thirdtable.userid(+) = myothertable.otherid", engine=oracle.engine({}, use_ansi=False)) + </ins><span class="cx"> def testbindparam(self): </span><span class="cx"> self.runtest(select( </span><span class="cx"> [table1, table2], </span></span></pre> </div> </div> </body> </html> |
