base begin method returns transaciton object

diff --git a/lib/sqlalchemy/mapping/objectstore.py b/lib/sqlalchemy/mapping/objectstore.py
index f2214d5750fa31f81ac6fecbad7db298ac0f87f6..a3aac738b6a8ee1a991a18356ed28cf7a8a04e52 100644 (file)
--- a/lib/sqlalchemy/mapping/objectstore.py
+++ b/lib/sqlalchemy/mapping/objectstore.py
@@ -203,7 +203,7 @@ def get_row_key(row, class_, table, primary_key):
 def begin():
     """begins a new UnitOfWork transaction.  the next commit will affect only
     objects that are created, modified, or deleted following the begin statement."""
-    get_session().begin()
+    return get_session().begin()
 
 def commit(*obj):
     """commits the current UnitOfWork transaction.  if a transaction was begun 

diff --git a/test/proxy_engine.py b/test/proxy_engine.py
index e235a22212e3128fc643f84e8cb05227e6bba834..2ef19fc075c92e5265a590dbfdd4afc919cc0cf5 100644 (file)
--- a/test/proxy_engine.py
+++ b/test/proxy_engine.py
@@ -34,12 +34,12 @@ class ProxyEngineTest1(PersistTest):
         users.create()
         assign_mapper(User, users)
         try:
-            objectstore.begin()
+            trans = objectstore.begin()
 
             user = User()
             user.user_name='fred'
             user.password='*'
-            objectstore.commit()
+            trans.commit()
 
             # select
             sqluser = User.select_by(user_name='fred')[0]
@@ -83,7 +83,7 @@ class ThreadProxyTest(PersistTest):
                     module_engine.connect(db_uri)
                     users.create()
                     try:
-                        objectstore.begin()
+                        trans  = objectstore.begin()
 
                         all = User.select()[:]
                         assert all == []
@@ -91,7 +91,7 @@ class ThreadProxyTest(PersistTest):
                         u = User()
                         u.user_name = uname
                         u.password = 'whatever'
-                        objectstore.commit()
+                        trans.commit()
 
                         names = [ us.user_name for us in User.select() ]
                         assert names == [ uname ]