r9457: Reworked CLSQL file structure.

[clsql.git] / sql / conditions.lisp

diff --git a/sql/conditions.lisp b/sql/conditions.lisp
index 413eae61630bbcddfaed113ad6857d61684df5b9..dc48d2fc1201a1da10ad512041b0515621aa2975 100644 (file)
--- a/sql/conditions.lisp
+++ b/sql/conditions.lisp
@@ -25,7 +25,10 @@ set to :error to signal an error or :ignore/nil to silently ignore the warning."
 (define-condition sql-condition ()
   ())
 
-(define-condition sql-database-error (simple-error sql-condition)
+(define-condition sql-error (simple-error)
+  ())
+
+(define-condition sql-database-error (sql-error)
   ((error-id :initarg :error-id 
             :initform nil
             :reader sql-error-error-id)
@@ -45,7 +48,8 @@ set to :error to signal an error or :ignore/nil to silently ignore the warning."
                         "")
                     (sql-error-error-id c)
                     (sql-error-secondary-error-id c)
-                    (sql-error-database-message c)))))
+                    (sql-error-database-message c))))
+  (:documentation "Used to signal an error in a CLSQL database interface."))
 
 (define-condition sql-connection-error (sql-database-error)
   ((database-type :initarg :database-type :initform nil
@@ -59,7 +63,8 @@ set to :error to signal an error or :ignore/nil to silently ignore the warning."
                      (sql-error-database-type c))
                     (sql-error-database-type c)
                     (sql-error-error-id c)
-                    (sql-error-database-message c)))))
+                    (sql-error-database-message c))))
+  (:documentation "Used to signal an error in connecting to a database."))
 
 (define-condition sql-database-data-error (sql-database-error)
   ((expression :initarg :expression :initarg nil 
@@ -69,31 +74,49 @@ set to :error to signal an error or :ignore/nil to silently ignore the warning."
                     (sql-error-database c)
                     (sql-error-expression c)
                     (sql-error-error-id c)
-                    (sql-error-database-message c)))))
+                    (sql-error-database-message c))))
+  (:documentation "Used to signal an error with the SQL data
+  passed to a database."))
 
 (define-condition sql-temporary-error (sql-database-error)
-  ())
-
-(define-condition sql-user-error (simple-error sql-condition)
+  ()
+  (:documentation "Used to signal an error when the database
+cannot currently process a valid interaction because, for
+example, it is still executing another command possibly issued by
+another user."))
+
+(define-condition sql-timeout-error (sql-connection-error)
+  ()
+  (:documentation "Used to signal an error when the database
+times out while processing some operation."))
+
+(define-condition sql-fatal-error (sql-connection-error)
+  ()
+  (:documentation "Used to signal an error when the database
+connection is no longer usable."))
+
+(define-condition sql-user-error (sql-error)
   ((message :initarg :message
            :initform "Unspecified error"
            :reader sql-user-error-message))
   (:report (lambda (c stream)
             (format stream "A CLSQL lisp code error occurred: ~A "
-                    (sql-user-error-message c)))))
+                    (sql-user-error-message c))))
+  (:documentation  "Used to signal lisp errors inside CLSQL."))
+
 
 
 ;; Signal conditions
 
 (defun signal-closed-database-error (database)
-  (cerror 'sql-connection-error
-         :message
-         (format nil "Trying to perform operation on closed database ~A."
-                 database)))
+  (error 'sql-fatal-error
+        :database database
+        :message "Database is closed."))
 
 (defun signal-no-database-error (database)
-  (error 'sql-database-error 
-        :message (format nil "Not a database: ~A." database)))
+  (error 'sql-database-error
+        :database database
+        :message (format nil "~A is not a database." database)))
 
 
 ;;; CLSQL Extensions