[SQL-CVS] r4556 - in SQLObject/branches/1.3: docs sqlobject/tests

[<sub...@co...>]

Author: phd
Date: Sun Oct  7 06:12:39 2012
New Revision: 4556

Log:
Merged revision 4555 from branch 1.2: discard transactions (Neil Muller)

Modified:
   SQLObject/branches/1.3/docs/News.txt
   SQLObject/branches/1.3/sqlobject/tests/test_SQLMultipleJoin.py
   SQLObject/branches/1.3/sqlobject/tests/test_SQLRelatedJoin.py

Modified: SQLObject/branches/1.3/docs/News.txt
==============================================================================
--- SQLObject/branches/1.3/docs/News.txt	Sun Oct  7 06:09:33 2012	(r4555)
+++ SQLObject/branches/1.3/docs/News.txt	Sun Oct  7 06:12:39 2012	(r4556)
@@ -10,7 +10,7 @@
 SQLObject 1.3.2
 ===============
 
-* A bugfix was ported from `SQLObject 1.2.4`_.
+* A number of bugfixes were ported from `SQLObject 1.2.4`_.
 
 SQLObject 1.3.1
 ===============
@@ -40,6 +40,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.3/sqlobject/tests/test_SQLMultipleJoin.py
==============================================================================
--- SQLObject/branches/1.3/sqlobject/tests/test_SQLMultipleJoin.py	Sun Oct  7 06:09:33 2012	(r4555)
+++ SQLObject/branches/1.3/sqlobject/tests/test_SQLMultipleJoin.py	Sun Oct  7 06:12:39 2012	(r4556)
@@ -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.3/sqlobject/tests/test_SQLRelatedJoin.py
==============================================================================
--- SQLObject/branches/1.3/sqlobject/tests/test_SQLRelatedJoin.py	Sun Oct  7 06:09:33 2012	(r4555)
+++ SQLObject/branches/1.3/sqlobject/tests/test_SQLRelatedJoin.py	Sun Oct  7 06:12:39 2012	(r4556)
@@ -54,5 +54,5 @@
         assert t1.fightersAsSResult.count() == 1
         assert t1.fightersAsSResult[0]._connection == trans
     finally:
+        trans.commit(True)
         Tourtment._connection.autoCommit = True
-