X-Git-Url: http://git.kpe.io/?p=clsql.git;a=blobdiff_plain;f=base%2Fconditions.lisp;h=6b7d971d6cf3df623922b11c06e7aeadeaa87fff;hp=f6f7e7f0364c165a926b229adf629529ba9e5a07;hb=09f07ac9d914a83f9426609f3264f4e66b5a6d97;hpb=2c14c425a4a203e03b74b868fdf727ea0d48572a

diff --git a/base/conditions.lisp b/base/conditions.lisp
index f6f7e7f..6b7d971 100644
--- a/base/conditions.lisp
+++ b/base/conditions.lisp
@@ -18,7 +18,11 @@
 ;;;; (http://opensource.franz.com/preamble.html), also known as the LLGPL.
 ;;;; *************************************************************************
 
-(in-package #:clsql-base-sys)
+(in-package #:clsql-base)
+
+(defvar *backend-warning-behavior* :warn
+  "Action to perform on warning messages from backend. Default is to :warn. May also be
+set to :error to signal an error or :ignore/nil to silently ignore the warning.")
 
 ;;; Conditions
 (define-condition clsql-condition ()
@@ -36,6 +40,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)
@@ -88,15 +98,20 @@ and signal an clsql-invalid-spec-error if they don't match."
 
 (define-condition clsql-sql-error (clsql-error)
   ((database :initarg :database :reader clsql-sql-error-database)
-   (expression :initarg :expression :reader clsql-sql-error-expression)
-   (errno :initarg :errno :reader clsql-sql-error-errno)
-   (error :initarg :error :reader clsql-sql-error-error))
+   (message :initarg :message :initform nil :reader clsql-sql-error-message)
+   (expression :initarg :expression :initarg nil :reader clsql-sql-error-expression)
+   (errno :initarg :errno :initarg nil :reader clsql-sql-error-errno)
+   (error :initarg :error :initarg nil :reader clsql-sql-error-error))
   (:report (lambda (c stream)
-	     (format stream "While accessing database ~A~%  with expression ~S:~%  Error ~D / ~A~%  has occurred."
-		     (clsql-sql-error-database c)
-		     (clsql-sql-error-expression c)
-		     (clsql-sql-error-errno c)
-		     (clsql-sql-error-error c)))))
+	     (if (clsql-sql-error-message c)
+		 (format stream "While accessing database ~A~%, Error~%  ~A~%  has occurred."
+			 (clsql-sql-error-database c)
+			 (clsql-sql-error-message c))
+	       (format stream "While accessing database ~A~%  with expression ~S:~%  Error ~D / ~A~%  has occurred."
+		       (clsql-sql-error-database c)
+		       (clsql-sql-error-expression c)
+		       (clsql-sql-error-errno c)
+		       (clsql-sql-error-error c))))))
 
 (define-condition clsql-database-warning (clsql-warning)
   ((database :initarg :database :reader clsql-database-warning-database)
@@ -151,6 +166,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
 
 
@@ -182,3 +207,4 @@ and signal an clsql-invalid-spec-error if they don't match."
   (:report (lambda (c stream)
 	     (format stream "Invalid SQL syntax: ~A"
 		     (clsql-sql-syntax-error-reason c)))))
+