From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Sat, 18 Feb 2006 22:31:47 +0000 (+0000)
Subject: base begin method returns transaciton object
X-Git-Tag: rel_0_1_1~26
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d953de35d67a75863eae5857239be99d1d9b81e0;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

base begin method returns transaciton object
---

diff --git a/lib/sqlalchemy/mapping/objectstore.py b/lib/sqlalchemy/mapping/objectstore.py
index f2214d5750..a3aac738b6 100644
--- 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 e235a22212..2ef19fc075 100644
--- 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 ]