[Sqlalchemy-commits] [5134] sqlalchemy/trunk: Fixed session.transaction.commit() on a autocommit =F
Brought to you by:
zzzeek
Menu
▾
▴
[Sqlalchemy-commits] [5134] sqlalchemy/trunk: Fixed session.transaction.commit() on a autocommit =False session not starting a new transaction.
|
From: <co...@sq...> - 2008-09-30 09:24:47
|
<!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><meta http-equiv="content-type" content="text/html; charset=utf-8" /><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, #header, #footer { 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; } #header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; } #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>[5134] sqlalchemy/trunk: Fixed session.transaction.commit() on a autocommit =False session not starting a new transaction.</title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>5134</dd> <dt>Author</dt> <dd>ants</dd> <dt>Date</dt> <dd>2008-09-30 05:24:27 -0400 (Tue, 30 Sep 2008)</dd> </dl> <h3>Log Message</h3> <pre>Fixed session.transaction.commit() on a autocommit=False session not starting a new transaction. Moved starting a new transaction in case of previous closing into SessionTransaction.</pre> <h3>Modified Paths</h3> <ul> <li><a href="#sqlalchemytrunkCHANGES">sqlalchemy/trunk/CHANGES</a></li> <li><a href="#sqlalchemytrunklibsqlalchemyormsessionpy">sqlalchemy/trunk/lib/sqlalchemy/orm/session.py</a></li> <li><a href="#sqlalchemytrunktestormsessionpy">sqlalchemy/trunk/test/orm/session.py</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="sqlalchemytrunkCHANGES"></a> <div class="modfile"><h4>Modified: sqlalchemy/trunk/CHANGES (5133 => 5134)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/trunk/CHANGES 2008-09-28 19:10:22 UTC (rev 5133) +++ sqlalchemy/trunk/CHANGES 2008-09-30 09:24:27 UTC (rev 5134) </span><span class="lines">@@ -40,6 +40,9 @@ </span><span class="cx"> - Removed the "raiseerror" keyword argument from object_mapper() </span><span class="cx"> and class_mapper(). These functions raise in all cases </span><span class="cx"> if the given class/instance is not mapped. </span><ins>+ + - Fixed session.transaction.commit() on a autocommit=False + session not starting a new transaction. </ins><span class="cx"> - sql </span><span class="cx"> - column.in_(someselect) can now be used as a columns-clause </span><span class="cx"> expression without the subquery bleeding into the FROM clause </span></span></pre></div> <a id="sqlalchemytrunklibsqlalchemyormsessionpy"></a> <div class="modfile"><h4>Modified: sqlalchemy/trunk/lib/sqlalchemy/orm/session.py (5133 => 5134)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/trunk/lib/sqlalchemy/orm/session.py 2008-09-28 19:10:22 UTC (rev 5133) +++ sqlalchemy/trunk/lib/sqlalchemy/orm/session.py 2008-09-30 09:24:27 UTC (rev 5134) </span><span class="lines">@@ -428,6 +428,8 @@ </span><span class="cx"> connection.close() </span><span class="cx"> else: </span><span class="cx"> transaction.close() </span><ins>+ if not self.session.autocommit: + self.session.begin() </ins><span class="cx"> self._deactivate() </span><span class="cx"> self.session = None </span><span class="cx"> self._connections = None </span><span class="lines">@@ -641,8 +643,6 @@ </span><span class="cx"> pass </span><span class="cx"> else: </span><span class="cx"> self.transaction.rollback() </span><del>- if self.transaction is None and not self.autocommit: - self.begin() </del><span class="cx"> </span><span class="cx"> def commit(self): </span><span class="cx"> """Flush pending changes and commit the current transaction. </span><span class="lines">@@ -667,8 +667,6 @@ </span><span class="cx"> raise sa_exc.InvalidRequestError("No transaction is begun.") </span><span class="cx"> </span><span class="cx"> self.transaction.commit() </span><del>- if self.transaction is None and not self.autocommit: - self.begin() </del><span class="cx"> </span><span class="cx"> def prepare(self): </span><span class="cx"> """Prepare the current transaction in progress for two phase commit. </span><span class="lines">@@ -772,9 +770,6 @@ </span><span class="cx"> if self.transaction is not None: </span><span class="cx"> for transaction in self.transaction._iterate_parents(): </span><span class="cx"> transaction.close() </span><del>- if not self.autocommit: - # note this doesnt use any connection resources - self.begin() </del><span class="cx"> </span><span class="cx"> def close_all(cls): </span><span class="cx"> """Close *all* sessions in memory.""" </span></span></pre></div> <a id="sqlalchemytrunktestormsessionpy"></a> <div class="modfile"><h4>Modified: sqlalchemy/trunk/test/orm/session.py (5133 => 5134)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/trunk/test/orm/session.py 2008-09-28 19:10:22 UTC (rev 5133) +++ sqlalchemy/trunk/test/orm/session.py 2008-09-30 09:24:27 UTC (rev 5134) </span><span class="lines">@@ -572,6 +572,15 @@ </span><span class="cx"> self.assertRaisesMessage(sa.exc.InvalidRequestError, "inactive due to a rollback in a subtransaction", sess.begin, subtransactions=True) </span><span class="cx"> sess.close() </span><span class="cx"> </span><ins>+ @testing.resolve_artifact_names + def test_no_autocommit_with_explicit_commit(self): + mapper(User, users) + session = create_session(autocommit=False) + + session.add(User(name='ed')) + session.transaction.commit() + assert session.transaction is not None, "autocommit=False should start a new transaction" + </ins><span class="cx"> @engines.close_open_connections </span><span class="cx"> @testing.resolve_artifact_names </span><span class="cx"> def test_bound_connection(self): </span></span></pre> </div> </div> </body> </html> |