r11859: Canonicalize whitespace

[clsql.git] / sql / transaction.lisp

diff --git a/sql/transaction.lisp b/sql/transaction.lisp
index a9df87fd59f9f579c4aadf19a9b804c832397b30..1c6e98b7131f45ba439e21af4712a43d97eec56c 100644 (file)
--- a/sql/transaction.lisp
+++ b/sql/transaction.lisp
@@ -18,11 +18,11 @@
   ((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 
+(defun add-transaction-commit-hook (commit-hook &key
                                     (database *default-database*))
   "Adds COMMIT-HOOK, which should a designator for a function
 with no required arguments, to the list of hooks run when COMMIT
@@ -30,7 +30,7 @@ is called on DATABASE which defaults to *DEFAULT-DATABASE*."
   (when (transaction database)
     (push commit-hook (commit-hooks (transaction database)))))
 
-(defun add-transaction-rollback-hook (rollback-hook 
+(defun add-transaction-rollback-hook (rollback-hook
                                       &key (database *default-database*))
   "Adds ROLLBACK-HOOK, which should a designator for a function
 with no required arguments, to the list of hooks run when ROLLBACK
@@ -40,11 +40,11 @@ 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))))
+    (setf (transaction database)
+          (make-instance 'transaction :previous-autocommit
+                         (database-autocommit database))))
   (setf (database-autocommit database) nil)
-  (when (= (incf (transaction-level database) 1))
+  (when (= (incf (transaction-level database)) 1)
     (let ((transaction (transaction database)))
       (setf (commit-hooks transaction) nil
             (rollback-hooks transaction) nil
@@ -54,30 +54,37 @@ 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:
+;; 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))
-         (execute-command "COMMIT" :database database)
-         (setf autocommit (previous-autocommit transaction))
+          (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)))
         (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 
-               (execute-command "ROLLBACK" :database database)
-           (setf autocommit (previous-autocommit transaction))
+          (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))
             (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)
@@ -106,14 +113,14 @@ back and otherwise the transaction is committed."
 currently within the scope of a transaction, commits changes made
 since the transaction began."
   (database-commit-transaction database)
-  nil) 
+  nil)
 
 (defun rollback (&key (database *default-database*))
   "If DATABASE, which defaults to *DEFAULT-DATABASE*, is
 currently within the scope of a transaction, rolls back changes
 made since the transaction began."
   (database-abort-transaction database)
-  nil) 
+  nil)
 
 (defun start-transaction (&key (database *default-database*))
   "Starts a transaction block on DATABASE which defaults to