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 a9d94c9d0ea159605838487be1fd690ef6cf985f..24465d174f5a39529dc1e19d6ecd522c57b0e8e5 100644 (file)
--- a/sql/transaction.lisp
+++ b/sql/transaction.lisp
@@ -41,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)))
@@ -52,7 +54,7 @@ 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))
@@ -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