[Sqlalchemy-commits] [1099] sqlalchemy/trunk/lib/sqlalchemy/sql.py: selects within a compound clause
Brought to you by:
zzzeek
Menu
▾
▴
[Sqlalchemy-commits] [1099] sqlalchemy/trunk/lib/sqlalchemy/sql.py: selects within a compound clause dont get parenthesis added
|
From: <co...@sq...> - 2006-03-06 01:09:14
|
<!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>[1099] sqlalchemy/trunk/lib/sqlalchemy/sql.py: selects within a compound clause dont get parenthesis added</title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>1099</dd> <dt>Author</dt> <dd>zzzeek</dd> <dt>Date</dt> <dd>2006-03-05 19:09:03 -0600 (Sun, 05 Mar 2006)</dd> </dl> <h3>Log Message</h3> <pre>selects within a compound clause dont get parenthesis added fix to ColumnClause</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 (1098 => 1099)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/trunk/lib/sqlalchemy/sql.py 2006-03-06 01:07:48 UTC (rev 1098) +++ sqlalchemy/trunk/lib/sqlalchemy/sql.py 2006-03-06 01:09:03 UTC (rev 1099) </span><span class="lines">@@ -635,6 +635,9 @@ </span><span class="cx"> Since compare() is meant to compare statement syntax, this method </span><span class="cx"> returns True if the two BindParamClauses have just the same type.""" </span><span class="cx"> return isinstance(other, BindParamClause) and other.type.__class__ == self.type.__class__ </span><ins>+ def _make_proxy(self, selectable, name = None): + return self +# return self.obj._make_proxy(selectable, name=self.name) </ins><span class="cx"> </span><span class="cx"> class TextClause(ClauseElement): </span><span class="cx"> """represents literal a SQL text fragment. public constructor is the </span><span class="lines">@@ -988,7 +991,7 @@ </span><span class="cx"> return BindParamClause(self.table.name + "_" + self.text, obj, shortname = self.text, type=self.type) </span><span class="cx"> def _make_proxy(self, selectable, name = None): </span><span class="cx"> c = ColumnClause(name or self.text, selectable) </span><del>- selectable.columns[c.key] = c </del><ins>+ selectable.columns[c.name] = c </ins><span class="cx"> return c </span><span class="cx"> def _compare_type(self, obj): </span><span class="cx"> return self.type </span><span class="lines">@@ -1205,6 +1208,11 @@ </span><span class="cx"> self.is_where = is_where </span><span class="cx"> def visit_compound_select(self, cs): </span><span class="cx"> self.visit_select(cs) </span><ins>+ # unselect the 'issubquery' flag on the selects within the compound, + # i.e. "SELECT foo UNION SELECT bar", since the enclosing compound select + # is the "subquery" + for s in cs.selects: + s.issubquery = False </ins><span class="cx"> def visit_column(self, c):pass </span><span class="cx"> def visit_table(self, c):pass </span><span class="cx"> def visit_select(self, select): </span></span></pre> </div> </div> </body> </html> |
