[Sqlalchemy-commits] [1014] sqlalchemy/trunk/lib/sqlalchemy/mapping/objectstore.py: when begin/commi
Brought to you by:
zzzeek
Menu
▾
▴
[Sqlalchemy-commits] [1014] sqlalchemy/trunk/lib/sqlalchemy/mapping/objectstore.py: when begin/commit, an exception should still reset the transactional state
|
From: <co...@sq...> - 2006-02-22 07:46:34
|
<!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>[1014] sqlalchemy/trunk/lib/sqlalchemy/mapping/objectstore.py: when begin/commit, an exception should still reset the transactional state</title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>1014</dd> <dt>Author</dt> <dd>zzzeek</dd> <dt>Date</dt> <dd>2006-02-21 18:33:38 -0600 (Tue, 21 Feb 2006)</dd> </dl> <h3>Log Message</h3> <pre>when begin/commit, an exception should still reset the transactional state</pre> <h3>Modified Paths</h3> <ul> <li><a href="#sqlalchemytrunklibsqlalchemymappingobjectstorepy">sqlalchemy/trunk/lib/sqlalchemy/mapping/objectstore.py</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="sqlalchemytrunklibsqlalchemymappingobjectstorepy"></a> <div class="modfile"><h4>Modified: sqlalchemy/trunk/lib/sqlalchemy/mapping/objectstore.py (1013 => 1014)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/trunk/lib/sqlalchemy/mapping/objectstore.py 2006-02-22 00:28:59 UTC (rev 1013) +++ sqlalchemy/trunk/lib/sqlalchemy/mapping/objectstore.py 2006-02-22 00:33:38 UTC (rev 1014) </span><span class="lines">@@ -119,9 +119,11 @@ </span><span class="cx"> </span><span class="cx"> def _trans_commit(self, trans): </span><span class="cx"> if trans.uow is self.uow and trans.isactive: </span><del>- self.uow.commit() - self.uow = self.parent_uow - self.parent_uow = None </del><ins>+ try: + self.uow.commit() + finally: + self.uow = self.parent_uow + self.parent_uow = None </ins><span class="cx"> def _trans_rollback(self, trans): </span><span class="cx"> if trans.uow is self.uow: </span><span class="cx"> self.uow = self.parent_uow </span></span></pre> </div> </div> </body> </html> |
