[Sqlalchemy-commits] [1100] sqlalchemy/trunk/lib/sqlalchemy: more tweak to compoundselect parenthesi
Brought to you by:
zzzeek
Menu
▾
▴
[Sqlalchemy-commits] [1100] sqlalchemy/trunk/lib/sqlalchemy: more tweak to compoundselect parenthesizing/subquery flag
|
From: <co...@sq...> - 2006-03-06 01:17:21
|
<!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>[1100] sqlalchemy/trunk/lib/sqlalchemy: more tweak to compoundselect parenthesizing/subquery flag</title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>1100</dd> <dt>Author</dt> <dd>zzzeek</dd> <dt>Date</dt> <dd>2006-03-05 19:17:12 -0600 (Sun, 05 Mar 2006)</dd> </dl> <h3>Log Message</h3> <pre>more tweak to compoundselect parenthesizing/subquery flag</pre> <h3>Modified Paths</h3> <ul> <li><a href="#sqlalchemytrunklibsqlalchemyansisqlpy">sqlalchemy/trunk/lib/sqlalchemy/ansisql.py</a></li> <li><a href="#sqlalchemytrunklibsqlalchemysqlpy">sqlalchemy/trunk/lib/sqlalchemy/sql.py</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="sqlalchemytrunklibsqlalchemyansisqlpy"></a> <div class="modfile"><h4>Modified: sqlalchemy/trunk/lib/sqlalchemy/ansisql.py (1099 => 1100)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/trunk/lib/sqlalchemy/ansisql.py 2006-03-06 01:09:03 UTC (rev 1099) +++ sqlalchemy/trunk/lib/sqlalchemy/ansisql.py 2006-03-06 01:17:12 UTC (rev 1100) </span><span class="lines">@@ -186,7 +186,7 @@ </span><span class="cx"> # if we are within a visit to a Select, set up the "typemap" </span><span class="cx"> # for this column which is used to translate result set values </span><span class="cx"> self.typemap.setdefault(column.key.lower(), column.type) </span><del>- if column.table is not None and column.table.name is None: </del><ins>+ if column.table is None or column.table.name is None: </ins><span class="cx"> self.strings[column] = column.name </span><span class="cx"> else: </span><span class="cx"> self.strings[column] = "%s.%s" % (column.table.name, column.name) </span><span class="lines">@@ -368,7 +368,7 @@ </span><span class="cx"> </span><span class="cx"> text += self.visit_select_postclauses(select) </span><span class="cx"> </span><del>- if getattr(select, 'issubquery', False): </del><ins>+ if getattr(select, 'useparens', False): </ins><span class="cx"> self.strings[select] = "(" + text + ")" </span><span class="cx"> else: </span><span class="cx"> self.strings[select] = text </span></span></pre></div> <a id="sqlalchemytrunklibsqlalchemysqlpy"></a> <div class="modfile"><h4>Modified: sqlalchemy/trunk/lib/sqlalchemy/sql.py (1099 => 1100)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/trunk/lib/sqlalchemy/sql.py 2006-03-06 01:09:03 UTC (rev 1099) +++ sqlalchemy/trunk/lib/sqlalchemy/sql.py 2006-03-06 01:17:12 UTC (rev 1100) </span><span class="lines">@@ -1208,11 +1208,8 @@ </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><del>- # 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" </del><span class="cx"> for s in cs.selects: </span><del>- s.issubquery = False </del><ins>+ s.useparens = 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 class="lines">@@ -1220,6 +1217,7 @@ </span><span class="cx"> return </span><span class="cx"> select.is_where = self.is_where </span><span class="cx"> select.issubquery = True </span><ins>+ select.useparens = True </ins><span class="cx"> if getattr(select, '_correlated', None) is None: </span><span class="cx"> select._correlated = self.select._froms </span><span class="cx"> </span></span></pre> </div> </div> </body> </html> |
