TLConnection insures that it is used to create a transaction via the session when begin() is called, so that it has proper transactional context, + unittests

This commit is contained in:
Mike Bayer
2006-06-22 19:46:44 +00:00
parent 4875953e03
commit 5f3451fcc3
3 changed files with 40 additions and 4 deletions
+2
View File
@@ -1,6 +1,8 @@
0.2.4
- try/except when the mapper sets init.__name__ on a mapped class,
supports python 2.3
- fixed bug where threadlocal engine would still autocommit
despite a transaction in progress
- lazy load and deferred load operations require the parent object
to be in a Session to do the operation; whereas before the operation
would just return a blank list or None, it now raises an exception.
+6 -4
View File
@@ -23,10 +23,12 @@ class TLSession(object):
except AttributeError:
pass
self.__tcount = 0
def begin(self):
def begin(self, tlconnection=None):
if self.__tcount == 0:
self.__transaction = self.get_connection()
if tlconnection is None:
self.__transaction = self.get_connection()
else:
self.__transaction = tlconnection
self.__trans = self.__transaction._begin()
self.__tcount += 1
return self.__trans
@@ -61,7 +63,7 @@ class TLConnection(base.Connection):
def _begin(self):
return base.Connection.begin(self)
def begin(self):
return self.session.begin()
return self.session.begin(self)
def close(self):
if self.__opencount == 1:
base.Connection.close(self)
+32
View File
@@ -157,6 +157,38 @@ class TLTransactionTest(testbase.PersistTest):
finally:
external_connection.close()
@testbase.unsupported('mysql')
def testrollback_off_conn(self):
conn = tlengine.contextual_connect()
trans = conn.begin()
conn.execute(users.insert(), user_id=1, user_name='user1')
conn.execute(users.insert(), user_id=2, user_name='user2')
conn.execute(users.insert(), user_id=3, user_name='user3')
trans.rollback()
external_connection = tlengine.connect()
result = external_connection.execute("select * from query_users")
try:
assert len(result.fetchall()) == 0
finally:
external_connection.close()
@testbase.unsupported('mysql')
def testcommit_off_conn(self):
conn = tlengine.contextual_connect()
trans = conn.begin()
conn.execute(users.insert(), user_id=1, user_name='user1')
conn.execute(users.insert(), user_id=2, user_name='user2')
conn.execute(users.insert(), user_id=3, user_name='user3')
trans.commit()
external_connection = tlengine.connect()
result = external_connection.execute("select * from query_users")
try:
assert len(result.fetchall()) == 3
finally:
external_connection.close()
@testbase.unsupported('mysql', 'sqlite')
def testnesting(self):
"""tests nesting of tranacstions"""