Author: phd
Date: Sun Oct 7 06:09:33 2012
New Revision: 4555
Log:
Discard transactions (Neil Muller)
Modified:
SQLObject/branches/1.2/docs/News.txt
SQLObject/branches/1.2/sqlobject/tests/test_SQLMultipleJoin.py
SQLObject/branches/1.2/sqlobject/tests/test_SQLRelatedJoin.py
Modified: SQLObject/branches/1.2/docs/News.txt
==============================================================================
--- SQLObject/branches/1.2/docs/News.txt Sat Oct 6 10:49:42 2012 (r4554)
+++ SQLObject/branches/1.2/docs/News.txt Sun Oct 7 06:09:33 2012 (r4555)
@@ -13,6 +13,8 @@
* Fixed a bug in sqlbuilder.Select.filter - removed comparison with
SQLTrueClause.
+* Neil Muller fixed a number of tests.
+
SQLObject 1.2.3
===============
Modified: SQLObject/branches/1.2/sqlobject/tests/test_SQLMultipleJoin.py
==============================================================================
--- SQLObject/branches/1.2/sqlobject/tests/test_SQLMultipleJoin.py Sat Oct 6 10:49:42 2012 (r4554)
+++ SQLObject/branches/1.2/sqlobject/tests/test_SQLMultipleJoin.py Sun Oct 7 06:09:33 2012 (r4555)
@@ -53,4 +53,5 @@
assert namek.fightersAsSResult.count() == 1
assert namek.fightersAsSResult[0]._connection == trans
finally:
- Race._connection.autoCommit = True
\ No newline at end of file
+ trans.commit(True)
+ Race._connection.autoCommit = True
Modified: SQLObject/branches/1.2/sqlobject/tests/test_SQLRelatedJoin.py
==============================================================================
--- SQLObject/branches/1.2/sqlobject/tests/test_SQLRelatedJoin.py Sat Oct 6 10:49:42 2012 (r4554)
+++ SQLObject/branches/1.2/sqlobject/tests/test_SQLRelatedJoin.py Sun Oct 7 06:09:33 2012 (r4555)
@@ -54,5 +54,5 @@
assert t1.fightersAsSResult.count() == 1
assert t1.fightersAsSResult[0]._connection == trans
finally:
+ trans.commit(True)
Tourtment._connection.autoCommit = True
-
|