[Sqlalchemy-commits] [1167] sqlalchemy/trunk/lib/sqlalchemy: got oracle parenthesized rules for func
Brought to you by:
zzzeek
Menu
▾
▴
[Sqlalchemy-commits] [1167] sqlalchemy/trunk/lib/sqlalchemy: got oracle parenthesized rules for funcs back, fixed copy_container on function
|
From: <co...@sq...> - 2006-03-18 00:33:02
|
<!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>[1167] sqlalchemy/trunk/lib/sqlalchemy: got oracle parenthesized rules for funcs back, fixed copy_container on function</title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>1167</dd> <dt>Author</dt> <dd>zzzeek</dd> <dt>Date</dt> <dd>2006-03-17 18:32:49 -0600 (Fri, 17 Mar 2006)</dd> </dl> <h3>Log Message</h3> <pre>got oracle parenthesized rules for funcs back, fixed copy_container on function</pre> <h3>Modified Paths</h3> <ul> <li><a href="#sqlalchemytrunklibsqlalchemyansisqlpy">sqlalchemy/trunk/lib/sqlalchemy/ansisql.py</a></li> <li><a href="#sqlalchemytrunklibsqlalchemydatabasesoraclepy">sqlalchemy/trunk/lib/sqlalchemy/databases/oracle.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 (1166 => 1167)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/trunk/lib/sqlalchemy/ansisql.py 2006-03-18 00:12:59 UTC (rev 1166) +++ sqlalchemy/trunk/lib/sqlalchemy/ansisql.py 2006-03-18 00:32:49 UTC (rev 1167) </span><span class="lines">@@ -220,10 +220,13 @@ </span><span class="cx"> else: </span><span class="cx"> self.strings[list] = string.join([self.get_str(c) for c in list.clauses], ', ') </span><span class="cx"> </span><ins>+ def apply_function_parens(self, func): + return func.name.upper() not in ANSI_FUNCS or len(func.clauses) > 0 + </ins><span class="cx"> def visit_function(self, func): </span><span class="cx"> if len(self.select_stack): </span><span class="cx"> self.typemap.setdefault(func.name, func.type) </span><del>- if func.name.upper() in ANSI_FUNCS and not len(func.clauses): </del><ins>+ if not self.apply_function_parens(func): </ins><span class="cx"> self.strings[func] = ".".join(func.packagenames + [func.name]) </span><span class="cx"> else: </span><span class="cx"> self.strings[func] = ".".join(func.packagenames + [func.name]) + "(" + string.join([self.get_str(c) for c in func.clauses], ', ') + ")" </span></span></pre></div> <a id="sqlalchemytrunklibsqlalchemydatabasesoraclepy"></a> <div class="modfile"><h4>Modified: sqlalchemy/trunk/lib/sqlalchemy/databases/oracle.py (1166 => 1167)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/trunk/lib/sqlalchemy/databases/oracle.py 2006-03-18 00:12:59 UTC (rev 1166) +++ sqlalchemy/trunk/lib/sqlalchemy/databases/oracle.py 2006-03-18 00:32:49 UTC (rev 1167) </span><span class="lines">@@ -221,6 +221,9 @@ </span><span class="cx"> gives Oracle a chance to tack on a "FROM DUAL" to the string output. """ </span><span class="cx"> return " FROM DUAL" </span><span class="cx"> </span><ins>+ def apply_function_parens(self, func): + return len(func.clauses) > 0 + </ins><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></span></pre></div> <a id="sqlalchemytrunklibsqlalchemysqlpy"></a> <div class="modfile"><h4>Modified: sqlalchemy/trunk/lib/sqlalchemy/sql.py (1166 => 1167)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/trunk/lib/sqlalchemy/sql.py 2006-03-18 00:12:59 UTC (rev 1166) +++ sqlalchemy/trunk/lib/sqlalchemy/sql.py 2006-03-18 00:32:49 UTC (rev 1167) </span><span class="lines">@@ -794,7 +794,7 @@ </span><span class="cx"> def __init__(self, name, *clauses, **kwargs): </span><span class="cx"> self.name = name </span><span class="cx"> self.type = kwargs.get('type', sqltypes.NULLTYPE) </span><del>- self.packagenames = kwargs.get('packagenames') </del><ins>+ self.packagenames = kwargs.get('packagenames', None) or [] </ins><span class="cx"> self._engine = kwargs.get('engine', None) </span><span class="cx"> if self._engine is not None: </span><span class="cx"> self.type = self._engine.type_descriptor(self.type) </span><span class="lines">@@ -813,7 +813,7 @@ </span><span class="cx"> data.setdefault(self, self) </span><span class="cx"> def copy_container(self): </span><span class="cx"> clauses = [clause.copy_container() for clause in self.clauses] </span><del>- return Function(self.name, type=self.type, *clauses) </del><ins>+ return Function(self.name, type=self.type, packagenames=self.packagenames, *clauses) </ins><span class="cx"> def accept_visitor(self, visitor): </span><span class="cx"> for c in self.clauses: </span><span class="cx"> c.accept_visitor(visitor) </span></span></pre> </div> </div> </body> </html> |
