Changeset combined,9 for combined

Timestamp:

08/06/2008 03:19:47 AM (18 years ago)

Author:

David Owen <dsowen@…>

branch-nick:

combined

parents:

Rev	Tree	Chgset
8	@combined,8	[combined,8]
2.2.7	@combined,2.2.7	[combined,2.2.7]

revision id:

dsowen@fugue88.ws-20080806031947-zpi6unkpsh25hutd

Message:

Merged from error-handling

Location:

combined

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) (2 diffs)
• src/odbc/plain-odbc-package.lisp (modified) (1 diff)

combined/plain-odbc.asd

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

combined/src/odbc/odbc-functions.lisp

@@ -88 +88 @@
         (declare (ignore msg-length)) 
         (values result-code
-                (make-condition
                  (if (eql result-code #.$SQL_SUCCESS_WITH_INFO)
-                   'sql-warning
-                   'sql-error)
-                 :error-message error-message
-                 :sql-state sql-state
-                 :error-code error-code))))
+                   (make-condition
+                    'sql-warning
+                    :error-message error-message
+                    :sql-state sql-state
+                    :error-code error-code)
+                   (make-error sql-state error-message)))))
     ; this can happen, using  a wrong handle
     (#.$SQL_INVALID_HANDLE
@@ -109 +109 @@
     (otherwise (error "unknown result of odbc execution: ~A" result-code))
     ))
+
 
 

combined/src/odbc/plain-odbc-package.lisp

@@ -14 +14 @@
 ; #+mcl "CCL" #+cormanlisp "WIN32" "CFFI")
   (:export
+   "PRINT-ODBC-ERROR"
+   "ODBC-ERROR"
+   "ERROR-MESSAGE"
+   "ERROR-CODE"
+
    "EXEC-SQL"
    "EXEC-QUERY"