Revert "db: don't nest transactions.

This reverts commit e599a83de7.
2012-09-26 13:29:40 -07:00 · 2012-09-26 13:29:40 -07:00 · 41227954e7
parent 14c6bad2f6
commit 41227954e7
1 changed files with 4 additions and 7 deletions
--- a/basis/db/db.factor
+++ b/basis/db/db.factor
@ -145,11 +145,8 @@ M: db-connection rollback-transaction ( -- ) "ROLLBACK" sql-command ;

 : in-transaction? ( -- ? ) in-transaction get ;

-: (with-transaction) ( quot -- )
-    t in-transaction [
-        begin-transaction [ ] [ rollback-transaction ] cleanup
-        commit-transaction
-    ] with-variable ; inline
-
 : with-transaction ( quot -- )
-    in-transaction get [ (with-transaction) ] unless ; inline
+    t in-transaction [
+        begin-transaction
+        [ ] [ rollback-transaction ] cleanup commit-transaction
+    ] with-variable ; inline