[Sqlalchemy-commits] [1536] sqlalchemy/trunk/test: would help if commit() worked too...
Brought to you by:
zzzeek
Menu
▾
▴
[Sqlalchemy-commits] [1536] sqlalchemy/trunk/test: would help if commit() worked too...
|
From: <co...@sq...> - 2006-05-28 17:59:17
|
<!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>[1536] sqlalchemy/trunk/test: would help if commit() worked too...</title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>1536</dd> <dt>Author</dt> <dd>zzzeek</dd> <dt>Date</dt> <dd>2006-05-28 12:59:06 -0500 (Sun, 28 May 2006)</dd> </dl> <h3>Log Message</h3> <pre>would help if commit() worked too...</pre> <h3>Modified Paths</h3> <ul> <li><a href="#sqlalchemytrunklibsqlalchemyenginethreadlocalpy">sqlalchemy/trunk/lib/sqlalchemy/engine/threadlocal.py</a></li> <li><a href="#sqlalchemytrunktesttransactionpy">sqlalchemy/trunk/test/transaction.py</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="sqlalchemytrunklibsqlalchemyenginethreadlocalpy"></a> <div class="modfile"><h4>Modified: sqlalchemy/trunk/lib/sqlalchemy/engine/threadlocal.py (1535 => 1536)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/trunk/lib/sqlalchemy/engine/threadlocal.py 2006-05-28 17:46:45 UTC (rev 1535) +++ sqlalchemy/trunk/lib/sqlalchemy/engine/threadlocal.py 2006-05-28 17:59:06 UTC (rev 1536) </span><span class="lines">@@ -31,10 +31,10 @@ </span><span class="cx"> def commit(self): </span><span class="cx"> if self.__tcount == 1: </span><span class="cx"> try: </span><del>- self._trans.commit() </del><ins>+ self.__trans.commit() </ins><span class="cx"> finally: </span><span class="cx"> del self.__transaction </span><del>- del self._trans </del><ins>+ del self.__trans </ins><span class="cx"> self.__tcount = 0 </span><span class="cx"> elif self.__tcount > 1: </span><span class="cx"> self.__tcount -= 1 </span></span></pre></div> <a id="sqlalchemytrunktesttransactionpy"></a> <div class="modfile"><h4>Modified: sqlalchemy/trunk/test/transaction.py (1535 => 1536)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/trunk/test/transaction.py 2006-05-28 17:46:45 UTC (rev 1535) +++ sqlalchemy/trunk/test/transaction.py 2006-05-28 17:59:06 UTC (rev 1536) </span><span class="lines">@@ -102,9 +102,29 @@ </span><span class="cx"> tlengine.execute(users.insert(), user_id=3, user_name='user3') </span><span class="cx"> tlengine.rollback() </span><span class="cx"> </span><del>- result = tlengine.execute("select * from query_users") - assert len(result.fetchall()) == 0 </del><ins>+ external_connection = tlengine.connect() + result = external_connection.execute("select * from query_users") + try: + assert len(result.fetchall()) == 0 + finally: + external_connection.close() </ins><span class="cx"> </span><ins>+ @testbase.unsupported('mysql') + def testcommit(self): + """test a basic commit""" + tlengine.begin() + tlengine.execute(users.insert(), user_id=1, user_name='user1') + tlengine.execute(users.insert(), user_id=2, user_name='user2') + tlengine.execute(users.insert(), user_id=3, user_name='user3') + tlengine.commit() + + external_connection = tlengine.connect() + result = external_connection.execute("select * from query_users") + try: + assert len(result.fetchall()) == 3 + finally: + external_connection.close() + </ins><span class="cx"> @testbase.unsupported('mysql', 'sqlite') </span><span class="cx"> def testnesting(self): </span><span class="cx"> """test a basic rollback""" </span><span class="lines">@@ -119,8 +139,10 @@ </span><span class="cx"> tlengine.execute(users.insert(), user_id=5, user_name='user5') </span><span class="cx"> tlengine.commit() </span><span class="cx"> tlengine.rollback() </span><del>- self.assert_(external_connection.scalar("select count(1) from query_users") == 0) - external_connection.close() </del><ins>+ try: + self.assert_(external_connection.scalar("select count(1) from query_users") == 0) + finally: + external_connection.close() </ins><span class="cx"> </span><span class="cx"> if __name__ == "__main__": </span><span class="cx"> testbase.main() </span></span></pre> </div> </div> </body> </html> |
