X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=sql%2Ftransaction.lisp;h=b7673d80c9c61bbe4c40313b584557d1f07746cd;hb=c41d81c0d1233372012a1de93fcdfd6b2a6e5618;hp=a9df87fd59f9f579c4aadf19a9b804c832397b30;hpb=fd2493718d0e1114fcbe3dd578dab658ea383e81;p=clsql.git

diff --git a/sql/transaction.lisp b/sql/transaction.lisp
index a9df87f..b7673d8 100644
--- a/sql/transaction.lisp
+++ b/sql/transaction.lisp
@@ -22,7 +22,7 @@
    (status :initform nil :accessor transaction-status
 	   :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) 
+    (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,11 +54,16 @@ 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)
+	  (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
@@ -70,8 +75,10 @@ is called on DATABASE which defaults to *DEFAULT-DATABASE*."
   (with-slots (transaction transaction-level autocommit) database
     (if (plusp transaction-level)
         (when (zerop (decf transaction-level))
-          (unwind-protect 
-               (execute-command "ROLLBACK" :database database)
+          (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
@@ -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