Revert "db: don't nest transactions.

This reverts commit e599a83de717b7b853aab67b89103805a0a05bd5.

diff --git a/basis/db/db.factor b/basis/db/db.factor
index da0cb9f42b063029bbf7817a6cc6f8265e7926b7..3c924e469888bb8c3067859bfeeffa95fce5c88d 100644 (file)
--- 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 -- )
+: with-transaction ( quot -- )
     t in-transaction [
-        begin-transaction [ ] [ rollback-transaction ] cleanup
-        commit-transaction
+        begin-transaction
+        [ ] [ rollback-transaction ] cleanup commit-transaction
     ] with-variable ; inline
-
-: with-transaction ( quot -- )
-    in-transaction get [ (with-transaction) ] unless ; inline