Automated commit for debian release 6.7.2-1

[clsql.git] / sql / transaction.lisp

diff --git a/sql/transaction.lisp b/sql/transaction.lisp
index b7673d80c9c61bbe4c40313b584557d1f07746cd..24465d174f5a39529dc1e19d6ecd522c57b0e8e5 100644 (file)
--- 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.
@@ -18,9 +16,9 @@
   ((commit-hooks :initform () :accessor commit-hooks)
    (rollback-hooks :initform () :accessor rollback-hooks)
    (previous-autocommit :initarg :previous-autocommit
-                       :reader previous-autocommit)
+                        :reader previous-autocommit)
    (status :initform nil :accessor transaction-status
-          :documentation "nil or :committed")))
+           :documentation "nil or :committed")))
 
 (defun add-transaction-commit-hook (commit-hook &key
                                     (database *default-database*))
@@ -41,8 +39,10 @@ is called on DATABASE which defaults to *DEFAULT-DATABASE*."
 (defmethod database-start-transaction ((database database))
   (unless (transaction database)
     (setf (transaction database)
-         (make-instance 'transaction :previous-autocommit
-                        (database-autocommit 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,44 +54,46 @@ 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."
-                     database)))))
+              (format nil "Cannot commit transaction against ~A because there is no transaction in progress."
+                      database)))))
 
 (defmethod database-abort-transaction ((database database))
   (with-slots (transaction transaction-level autocommit) database
     (if (plusp transaction-level)
         (when (zerop (decf transaction-level))
           (unwind-protect
-              (case (database-underlying-type database)
-                (:mssql (execute-command "ROLLBACK TRANSACTION" :database database))
-                (t (execute-command "ROLLBACK" :database database)))
-           (setf autocommit (previous-autocommit transaction))
+               (case (database-underlying-type database)
+                 (:mssql (execute-command "ROLLBACK TRANSACTION" :database database))
+                 (t (execute-command "ROLLBACK" :database database)))
+            (setf autocommit (previous-autocommit transaction))
             (map nil #'funcall (rollback-hooks transaction))))
         (warn 'sql-warning
-             :message
-             (format nil "Cannot abort transaction against ~A because there is no transaction in progress."
-                     database)))))
+              :message
+              (format nil "Cannot abort transaction against ~A because there is no transaction in progress."
+                      database)))))
 
 (defun mark-transaction-committed (database)
   (when (and (transaction 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