db: don't nest transactions.

2012-09-26 10:35:22 -07:00 · 2012-09-26 10:35:22 -07:00 · 14c6bad2f6
parent 9f4f76ab8c
commit 14c6bad2f6
1 changed files with 6 additions and 3 deletions
--- a/basis/db/db.factor
+++ b/basis/db/db.factor
@ -145,8 +145,11 @@ 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