Index: combined/src/odbc/odbc-functions.lisp
===================================================================
--- combined/src/odbc/odbc-functions.lisp	(revision combined,2.2.2)
+++ combined/src/odbc/odbc-functions.lisp	(revision combined,2.2.3)
@@ -111,40 +111,4 @@
 
 
-(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: