Changeset error-handling,5

Timestamp:

01/18/2008 12:58:17 AM (18 years ago)

Author:

David Owen <dsowen@…>

branch-nick:

error-handling

revision id:

dsowen@fugue88.ws-20080118005817-3jz82tlxi9e09uk4

Message:

• Made it very easy to define new ODBC errors.
• Added several ODBC errors.

Location:

error-handling

Files:

• src/odbc/error-base.lisp (added)
• src/odbc/error-defs.lisp (added)
• plain-odbc.asd (modified) (1 diff)
• src/odbc/odbc-functions.lisp (modified) (1 diff)
• src/odbc/plain-odbc-package.lisp (modified) (1 diff)

error-handling/plain-odbc.asd

@@ -11 +11 @@
                          (:file "cffi-support")
                          (:file "odbc-ff-interface")
+                         (:file "error-base")
+                         (:file "error-defs")
                          (:file "odbc-functions")
                          (:file "parameter")

error-handling/src/odbc/odbc-functions.lisp

@@ -111 +111 @@
 
 
-(defun print-odbc-error (condition stream)
-  (with-slots (message code) condition
-    (format stream "[ODBC error] ~a; state: ~a" message code)))
-
-(define-condition odbc-error (error)
-  ((message :initarg :message :reader error-message)
-   (code :initarg :code :reader error-code))
-  (:report print-odbc-error))
-
-(define-condition odbc-not-null-violation (odbc-error) ())
-
-(define-condition odbc-foreign-key-error (odbc-error) ())
-
-(define-condition odbc-unique-violation (odbc-error) ())
-
-(define-condition odbc-check-violation (odbc-error) ())
-
-(define-condition odbc-insufficient-privilege (odbc-error) ())
-
-(define-condition odbc-undefined-object (odbc-error) ())
-
-(defun read-and-throw-error (henv hdbc hstmt)
-  (multiple-value-bind (error-message sql-state)
-      (handle-error (or henv (cffi:null-pointer))
-                    (or hdbc (cffi:null-pointer))
-                    (or hstmt (cffi:null-pointer)))
-    (let ((type (cdr (assoc sql-state '(("23502" . odbc-not-null-violation)
-                                        ("23503" . odbc-foreign-key-error)
-                                        ("23505" . odbc-unique-violation)
-                                        ("23514" . odbc-check-violation)
-                                        ("42501" . odbc-insufficient-privilege)
-                                        ("42704" . odbc-undefined-object))
-                            :test #'string=))))
-      (error (if type type 'odbc-error)
-             :message error-message
-             :code sql-state))))
 
 ;;; rav:

error-handling/src/odbc/plain-odbc-package.lisp

@@ -12 +12 @@
    "COMMON-LISP" #+mcl "CCL" #+cormanlisp "WIN32" "CFFI")
   (:export
+   "PRINT-ODBC-ERROR"
    "ODBC-ERROR"
    "ERROR-MESSAGE"
    "ERROR-CODE"
-   "ODBC-NOT-NULL-VIOLATION"
-   "ODBC-FOREIGN-KEY-VIOLATION"
-   "ODBC-UNIQUE-VIOLATION"
-   "ODBC-CHECK-VIOLATION"
-   "ODBC-INSUFFICIENT-PRIVILEGE"
-   "ODBC-UNDEFINED-OBJECT"
 
    "EXEC-QUERY"