r9205: new release

[clsql.git] / base / conditions.lisp

diff --git a/base/conditions.lisp b/base/conditions.lisp
index f6f7e7f0364c165a926b229adf629529ba9e5a07..25d4623605396b0bdbd8b75e39b53f7b9d24e093 100644 (file)
--- a/base/conditions.lisp
+++ b/base/conditions.lisp
@@ -18,7 +18,7 @@
 ;;;; (http://opensource.franz.com/preamble.html), also known as the LLGPL.
 ;;;; *************************************************************************
 
-(in-package #:clsql-base-sys)
+(in-package #:clsql-base)
 
 ;;; Conditions
 (define-condition clsql-condition ()
@@ -36,6 +36,12 @@
 (define-condition clsql-simple-warning (simple-condition clsql-warning)
   ())
 
+(define-condition clsql-generic-error (clsql-error)
+  ((message :initarg :message
+           :reader clsql-generic-error-message))
+  (:report (lambda (c stream)
+            (format stream (clsql-generic-error-message c)))))
+
 (define-condition clsql-invalid-spec-error (clsql-error)
   ((connection-spec :initarg :connection-spec
                    :reader clsql-invalid-spec-error-connection-spec)
@@ -151,6 +157,16 @@ and signal an clsql-invalid-spec-error if they don't match."
             (format stream "~S is not a CLSQL database." 
                     (clsql-no-database-error-database c)))))
 
+(define-condition clsql-odbc-error (clsql-error)
+  ((odbc-message :initarg :odbc-message
+                :reader clsql-odbc-error-message)
+   (sql-state :initarg :sql-state :initform nil
+             :reader clsql-odbc-error-sql-state))
+  (:report (lambda (c stream)
+            (format stream "[ODBC error] ~A; state: ~A"
+                    (clsql-odbc-error-message c)
+                    (clsql-odbc-error-sql-state c)))))
+
 ;; Signal conditions