From 41227954e7c04e422cef837485c3f623dd8f5f04 Mon Sep 17 00:00:00 2001
From: John Benediktsson <mrjbq7@gmail.com>
Date: Wed, 26 Sep 2012 13:29:40 -0700
Subject: [PATCH] Revert "db: don't nest transactions.

This reverts commit e599a83de717b7b853aab67b89103805a0a05bd5.
---
 basis/db/db.factor | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/basis/db/db.factor b/basis/db/db.factor
index da0cb9f42b..3c924e4698 100644
--- 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