[Sqlalchemy-commits] [1169] sqlalchemy/trunk/test: got clause elements inside INSERTs going...
Brought to you by:
zzzeek
Menu
▾
▴
[Sqlalchemy-commits] [1169] sqlalchemy/trunk/test: got clause elements inside INSERTs going...
|
From: <co...@sq...> - 2006-03-19 04:20:20
|
<!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>[1169] sqlalchemy/trunk/test: got clause elements inside INSERTs going...</title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>1169</dd> <dt>Author</dt> <dd>zzzeek</dd> <dt>Date</dt> <dd>2006-03-18 22:20:06 -0600 (Sat, 18 Mar 2006)</dd> </dl> <h3>Log Message</h3> <pre>got clause elements inside INSERTs going...</pre> <h3>Modified Paths</h3> <ul> <li><a href="#sqlalchemytrunklibsqlalchemyansisqlpy">sqlalchemy/trunk/lib/sqlalchemy/ansisql.py</a></li> <li><a href="#sqlalchemytrunktestselectpy">sqlalchemy/trunk/test/select.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 (1168 => 1169)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/trunk/lib/sqlalchemy/ansisql.py 2006-03-18 00:33:50 UTC (rev 1168) +++ sqlalchemy/trunk/lib/sqlalchemy/ansisql.py 2006-03-19 04:20:06 UTC (rev 1169) </span><span class="lines">@@ -452,13 +452,21 @@ </span><span class="cx"> </span><span class="cx"> self.isinsert = True </span><span class="cx"> colparams = self._get_colparams(insert_stmt) </span><del>- for c in colparams: - b = c[1] - self.binds[b.key] = b - self.binds[b.shortname] = b - </del><ins>+ + def create_param(p): + if isinstance(p, sql.BindParamClause): + self.binds[p.key] = p + self.binds[p.shortname] = p + return self.bindparam_string(p.key) + else: + p.accept_visitor(self) + if isinstance(p, sql.ClauseElement) and not isinstance(p, sql.ColumnElement): + return "(" + self.get_str(p) + ")" + else: + return self.get_str(p) + </ins><span class="cx"> text = ("INSERT INTO " + insert_stmt.table.fullname + " (" + string.join([c[0].name for c in colparams], ', ') + ")" + </span><del>- " VALUES (" + string.join([self.bindparam_string(c[1].key) for c in colparams], ', ') + ")") </del><ins>+ " VALUES (" + string.join([create_param(c[1]) for c in colparams], ', ') + ")") </ins><span class="cx"> </span><span class="cx"> self.strings[insert_stmt] = text </span><span class="cx"> </span><span class="lines">@@ -482,7 +490,7 @@ </span><span class="cx"> return self.bindparam_string(p.key) </span><span class="cx"> else: </span><span class="cx"> p.accept_visitor(self) </span><del>- if isinstance(p, sql.ClauseElement) and not isinstance(p, sql.ColumnClause): </del><ins>+ if isinstance(p, sql.ClauseElement) and not isinstance(p, sql.ColumnElement): </ins><span class="cx"> return "(" + self.get_str(p) + ")" </span><span class="cx"> else: </span><span class="cx"> return self.get_str(p) </span></span></pre></div> <a id="sqlalchemytrunktestselectpy"></a> <div class="modfile"><h4>Modified: sqlalchemy/trunk/test/select.py (1168 => 1169)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/trunk/test/select.py 2006-03-18 00:33:50 UTC (rev 1168) +++ sqlalchemy/trunk/test/select.py 2006-03-19 04:20:06 UTC (rev 1169) </span><span class="lines">@@ -57,7 +57,6 @@ </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>- print "TEST with e", engine </del><span class="cx"> c = clause.compile(parameters=params, engine=engine) </span><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="lines">@@ -523,6 +522,9 @@ </span><span class="cx"> "INSERT INTO mytable (myid, name, description) VALUES (:myid, :name, :description)", </span><span class="cx"> checkparams = {'myid':3, 'name':'jack', 'description':'mydescription'} </span><span class="cx"> ) </span><ins>+ + def testinsertexpression(self): + self.runtest(insert(table1), "INSERT INTO mytable (myid) VALUES (lala())", params=dict(myid=func.lala())) </ins><span class="cx"> </span><span class="cx"> def testupdate(self): </span><span class="cx"> self.runtest(update(table1, table1.c.myid == 7), "UPDATE mytable SET name=:name WHERE mytable.myid = :mytable_myid", params = {table1.c.name:'fred'}) </span><span class="lines">@@ -543,7 +545,7 @@ </span><span class="cx"> values = { </span><span class="cx"> table1.c.name : table1.c.name + "lala", </span><span class="cx"> table1.c.myid : func.do_stuff(table1.c.myid, literal('hoho')) </span><del>- }), "UPDATE mytable SET myid=(do_stuff(mytable.myid, :literal_2)), name=(mytable.name + :mytable_name) WHERE mytable.myid = hoho(:hoho) AND mytable.name = :literal + mytable.name + :literal_1") </del><ins>+ }), "UPDATE mytable SET myid=do_stuff(mytable.myid, :literal_2), name=mytable.name + :mytable_name WHERE mytable.myid = hoho(:hoho) AND mytable.name = :literal + mytable.name + :literal_1") </ins><span class="cx"> </span><span class="cx"> def testcorrelatedupdate(self): </span><span class="cx"> # test against a straight text subquery </span></span></pre> </div> </div> </body> </html> |
