[Sqlalchemy-commits] [1348] sqlalchemy/trunk/test: fix to subquery parens
Brought to you by:
zzzeek
Menu
▾
▴
[Sqlalchemy-commits] [1348] sqlalchemy/trunk/test: fix to subquery parens
|
From: <co...@sq...> - 2006-04-28 15:03:19
|
<!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>[1348] sqlalchemy/trunk/test: fix to subquery parens</title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>1348</dd> <dt>Author</dt> <dd>zzzeek</dd> <dt>Date</dt> <dd>2006-04-28 10:02:49 -0500 (Fri, 28 Apr 2006)</dd> </dl> <h3>Log Message</h3> <pre>fix to subquery parens</pre> <h3>Modified Paths</h3> <ul> <li><a href="#sqlalchemytrunklibsqlalchemysqlpy">sqlalchemy/trunk/lib/sqlalchemy/sql.py</a></li> <li><a href="#sqlalchemytrunktestselectpy">sqlalchemy/trunk/test/select.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 (1347 => 1348)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/trunk/lib/sqlalchemy/sql.py 2006-04-28 01:37:29 UTC (rev 1347) +++ sqlalchemy/trunk/lib/sqlalchemy/sql.py 2006-04-28 15:02:49 UTC (rev 1348) </span><span class="lines">@@ -543,7 +543,6 @@ </span><span class="cx"> return BooleanExpression(self._compare_self(), null(), 'IS') </span><span class="cx"> else: </span><span class="cx"> obj = self._bind_param(obj) </span><del>- </del><span class="cx"> return BooleanExpression(self._compare_self(), obj, operator, type=self._compare_type(obj)) </span><span class="cx"> def _operate(self, operator, obj): </span><span class="cx"> if _is_literal(obj): </span><span class="lines">@@ -884,9 +883,9 @@ </span><span class="cx"> self.operator = operator </span><span class="cx"> self.type = sqltypes.to_instance(type) </span><span class="cx"> self.parens = False </span><del>- if isinstance(self.left, BinaryClause): </del><ins>+ if isinstance(self.left, BinaryClause) or isinstance(self.left, Selectable): </ins><span class="cx"> self.left.parens = True </span><del>- if isinstance(self.right, BinaryClause): </del><ins>+ if isinstance(self.right, BinaryClause) or isinstance(self.right, Selectable): </ins><span class="cx"> self.right.parens = True </span><span class="cx"> def copy_container(self): </span><span class="cx"> return BinaryClause(self.left.copy_container(), self.right.copy_container(), self.operator) </span></span></pre></div> <a id="sqlalchemytrunktestselectpy"></a> <div class="modfile"><h4>Modified: sqlalchemy/trunk/test/select.py (1347 => 1348)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/trunk/test/select.py 2006-04-28 01:37:29 UTC (rev 1347) +++ sqlalchemy/trunk/test/select.py 2006-04-28 15:02:49 UTC (rev 1348) </span><span class="lines">@@ -151,6 +151,7 @@ </span><span class="cx"> self.runtest( </span><span class="cx"> select([users, s.c.street], from_obj=[s]), </span><span class="cx"> """SELECT users.user_id, users.user_name, users.password, s.street FROM users, (SELECT addresses.street AS street FROM addresses WHERE addresses.user_id = users.user_id) AS s""") </span><ins>+ </ins><span class="cx"> </span><span class="cx"> def testcolumnsubquery(self): </span><span class="cx"> s = select([table1.c.myid], scalar=True, correlate=False) </span><span class="lines">@@ -623,6 +624,11 @@ </span><span class="cx"> u = update(table1, table1.c.name == 'jack', values = {table1.c.name : s}) </span><span class="cx"> self.runtest(u, "UPDATE mytable SET name=(SELECT myothertable.otherid, myothertable.othername FROM myothertable WHERE myothertable.otherid = mytable.myid) WHERE mytable.name = :mytable_name") </span><span class="cx"> </span><ins>+ # test a correlated WHERE clause + s = select([table2.c.othername], table2.c.otherid == 7) + u = update(table1, table1.c.name==s) + self.runtest(u, "UPDATE mytable SET myid=:myid, name=:name, description=:description WHERE mytable.name = (SELECT myothertable.othername FROM myothertable WHERE myothertable.otherid = :myothertable_otherid)") + </ins><span class="cx"> def testdelete(self): </span><span class="cx"> self.runtest(delete(table1, table1.c.myid == 7), "DELETE FROM mytable WHERE mytable.myid = :mytable_myid") </span><span class="cx"> </span></span></pre> </div> </div> </body> </html> |
