Fixes #159: exceptions happened during flush() should not be wrapped with CommitException

Author: kozlovsky

pony/orm/core.py

@@ -280,10 +280,19 @@ def transact_reraise(exc_class, exceptions):
 def commit():
     caches = _get_caches()
     if not caches: return
+
+    try:
+        for cache in caches:
+            cache.flush()
+    except:
+        rollback()
+        raise
+
     primary_cache = caches[0]
     other_caches = caches[1:]
     exceptions = []
-    try: primary_cache.commit()
+    try:
+        primary_cache.commit()
     except:
         exceptions.append(sys.exc_info())
         for cache in other_caches:

pony/orm/tests/test_db_session.py

@@ -296,6 +296,34 @@ def test():
             pass
         test()
 
+    @raises_exception(ZeroDivisionError)
+    def test_db_session_exceptions_1(self):
+        def before_insert(self):
+            1/0
+        self.X.before_insert = before_insert
+        with db_session:
+            self.X(a=3, b=3)
+            # Should raise ZeroDivisionError and not CommitException
+
+    @raises_exception(ZeroDivisionError)
+    def test_db_session_exceptions_2(self):
+        def before_insert(self):
+            1 / 0
+        self.X.before_insert = before_insert
+        with db_session:
+            self.X(a=3, b=3)
+            commit()
+            # Should raise ZeroDivisionError and not CommitException
+
+    @raises_exception(ZeroDivisionError)
+    def test_db_session_exceptions_3(self):
+        def before_insert(self):
+            1 / 0
+        self.X.before_insert = before_insert
+        with db_session:
+            self.X(a=3, b=3)
+            db.commit()
+            # Should raise ZeroDivisionError and not CommitException
 
 db = Database('sqlite', ':memory:')