r9335: Automated commit for Debian build of clsql upstream-version-2.10.16

[clsql.git] / base / transaction.lisp

diff --git a/base/transaction.lisp b/base/transaction.lisp
index 236705da1ad70cfb7c842fa73bf27613e09c7dbd..61438edf2a48be4f8edda77e5480a132cd92f7d5 100644 (file)
--- a/base/transaction.lisp
+++ b/base/transaction.lisp
@@ -12,7 +12,7 @@
 ;;;; (http://opensource.franz.com/preamble.html), also known as the LLGPL.
 ;;;; *************************************************************************
 
-(in-package #:clsql-base-sys)
+(in-package #:clsql-base)
 
 (defclass transaction ()
   ((commit-hooks :initform () :accessor commit-hooks)
@@ -32,11 +32,8 @@
   (when (transaction database)
     (push rollback-hook (rollback-hooks (transaction database)))))
 
-(defmethod database-start-transaction ((database closed-database))
-  (signal-closed-database-error database))
-
 (defmethod database-start-transaction (database)
-  (unless database (error 'clsql-nodb-error))
+  (unless database (error 'clsql-no-database-error))
   (unless (transaction database)
     (setf (transaction database) (make-instance 'transaction)))
   (when (= (incf (transaction-level database) 1))
@@ -46,9 +43,6 @@
             (transaction-status transaction) nil)
       (execute-command "BEGIN" :database database))))
 
-(defmethod database-commit-transaction ((database closed-database))
-  (signal-closed-database-error database))
-
 (defmethod database-commit-transaction (database)
     (if (> (transaction-level database) 0)
         (when (zerop (decf (transaction-level database)))
@@ -58,9 +52,6 @@
               :format-control "Cannot commit transaction against ~A because there is no transaction in progress."
               :format-arguments (list database))))
 
-(defmethod database-abort-transaction ((database closed-database))
-  (signal-closed-database-error database))
-
 (defmethod database-abort-transaction (database)
     (if (> (transaction-level database) 0)
         (when (zerop (decf (transaction-level database)))
@@ -72,7 +63,7 @@
               :format-arguments (list database))))
 
 
-(defmacro with-transaction ((&key (database *default-database*)) &rest body)
+(defmacro with-transaction ((&key (database '*default-database*)) &rest body)
   "Executes BODY within a transaction for DATABASE (which defaults to
 *DEFAULT-DATABASE*). The transaction is committed if the body finishes
 successfully (without aborting or throwing), otherwise the database is