[Sqlalchemy-commits] [1040] sqlalchemy/trunk/test: clauseelement.compile() totally works without an
Brought to you by:
zzzeek
Menu
▾
▴
[Sqlalchemy-commits] [1040] sqlalchemy/trunk/test: clauseelement.compile() totally works without an engine
|
From: <co...@sq...> - 2006-02-25 07:22:10
|
<!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>[1040] sqlalchemy/trunk/test: clauseelement.compile() totally works without an engine</title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>1040</dd> <dt>Author</dt> <dd>zzzeek</dd> <dt>Date</dt> <dd>2006-02-25 01:22:01 -0600 (Sat, 25 Feb 2006)</dd> </dl> <h3>Log Message</h3> <pre>clauseelement.compile() totally works without an engine</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 (1039 => 1040)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/trunk/lib/sqlalchemy/sql.py 2006-02-25 07:12:50 UTC (rev 1039) +++ sqlalchemy/trunk/lib/sqlalchemy/sql.py 2006-02-25 07:22:01 UTC (rev 1040) </span><span class="lines">@@ -1275,6 +1275,8 @@ </span><span class="cx"> if self._engine is not None: </span><span class="cx"> return self._engine </span><span class="cx"> for f in self._froms.values(): </span><ins>+ if f is self: + continue </ins><span class="cx"> e = f.engine </span><span class="cx"> if e is not None: </span><span class="cx"> self._engine = e </span></span></pre></div> <a id="sqlalchemytrunktestselectpy"></a> <div class="modfile"><h4>Modified: sqlalchemy/trunk/test/select.py (1039 => 1040)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/trunk/test/select.py 2006-02-25 07:12:50 UTC (rev 1039) +++ sqlalchemy/trunk/test/select.py 2006-02-25 07:22:01 UTC (rev 1040) </span><span class="lines">@@ -57,9 +57,7 @@ </span><span class="cx"> </span><span class="cx"> class SQLTest(PersistTest): </span><span class="cx"> def runtest(self, clause, result, engine = None, params = None, checkparams = None): </span><del>- if engine is None: - engine = db - c = clause.compile(engine, params) </del><ins>+ c = clause.compile(parameters = params, engine=engine) </ins><span class="cx"> self.echo("\nSQL String:\n" + str(c) + repr(c.get_params())) </span><span class="cx"> cc = re.sub(r'\n', '', str(c)) </span><span class="cx"> self.assert_(cc == result, str(c) + "\n does not match \n" + result) </span></span></pre> </div> </div> </body> </html> |
