X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=sql%2Ftransaction.lisp;h=24465d174f5a39529dc1e19d6ecd522c57b0e8e5;hb=534849c88501e0ea2ee5dbf78d13d8cb73814d71;hp=1c6e98b7131f45ba439e21af4712a43d97eec56c;hpb=e567409d9fff3f7231c2a0bb69b345e19de2b246;p=clsql.git

diff --git a/sql/transaction.lisp b/sql/transaction.lisp
index 1c6e98b..24465d1 100644
--- a/sql/transaction.lisp
+++ b/sql/transaction.lisp
@@ -1,8 +1,6 @@
 ;;;; -*- Mode: LISP; Syntax: ANSI-Common-Lisp; Base: 10 -*-
 ;;;; *************************************************************************
 ;;;;
-;;;; $Id$
-;;;;
 ;;;; Transaction support
 ;;;;
 ;;;; This file is part of CLSQL.
@@ -43,6 +41,8 @@ is called on DATABASE which defaults to *DEFAULT-DATABASE*."
     (setf (transaction database)
           (make-instance 'transaction :previous-autocommit
                          (database-autocommit database))))
+  ;; TODO: database-autocommit might get lost in some scenarios
+  ;; when pooling connections
   (setf (database-autocommit database) nil)
   (when (= (incf (transaction-level database)) 1)
     (let ((transaction (transaction database)))
@@ -54,18 +54,20 @@ is called on DATABASE which defaults to *DEFAULT-DATABASE*."
         (:mssql (execute-command "BEGIN TRANSACTION" :database database))
         (t (execute-command "BEGIN" :database database))))))
 
-;;ODBC should potentially be using it's scheme for transactions:
+;;ODBC should potentially be using the following scheme for transactions:
 ;; turn off autocommit for begin. then use sqlendtran (or maybe sqltransact)
 ;; whatever is appropriate for this version of odbc.
 (defmethod database-commit-transaction ((database database))
   (with-slots (transaction transaction-level autocommit) database
     (if (plusp transaction-level)
-        (when (zerop (decf transaction-level))
-          (case (database-underlying-type database)
-            (:mssql (execute-command "COMMIT TRANSACTION" :database database))
-            (t (execute-command "COMMIT" :database database)))
-          (setf autocommit (previous-autocommit transaction))
-          (map nil #'funcall (commit-hooks transaction)))
+        (if (zerop (decf transaction-level))
+            (progn
+              (case (database-underlying-type database)
+                (:mssql (execute-command "COMMIT TRANSACTION" :database database))
+                (t (execute-command "COMMIT" :database database)))
+              (setf autocommit (previous-autocommit transaction))
+              (map nil #'funcall (commit-hooks transaction)))
+            (setf (transaction-status (transaction database)) nil))
         (warn 'sql-warning
               :message
               (format nil "Cannot commit transaction against ~A because there is no transaction in progress."
@@ -91,7 +93,7 @@ is called on DATABASE which defaults to *DEFAULT-DATABASE*."
              (not (transaction-status (transaction database))))
     (setf (transaction-status (transaction database)) :committed)))
 
-(defmacro with-transaction ((&key (database '*default-database*)) &rest body)
+(defmacro with-transaction ((&key (database '*default-database*)) &body body)
   "Starts a transaction in the database specified by DATABASE,
 which is *DEFAULT-DATABASE* by default, and executes BODY within
 that transaction. If BODY aborts or throws, DATABASE is rolled