r9403: Rework conditions to be CommonSQL backward compatible

[clsql.git] / db-odbc / odbc-api.lisp

diff --git a/db-odbc/odbc-api.lisp b/db-odbc/odbc-api.lisp
index 66c9936b041193327782a1bc31f0f9ffcb8700e0..94017dc1132170999daf1463445089f20f2bdda2 100644 (file)
--- a/db-odbc/odbc-api.lisp
+++ b/db-odbc/odbc-api.lisp
@@ -27,8 +27,8 @@ May be locally bound to something else if a certain type is necessary.")
 (defvar *time-conversion-function*
     (lambda (universal-time &optional fraction)
       (declare (ignore fraction))
-      (clsql-base:format-time 
-       nil (clsql-base:utime->time universal-time) 
+      (clsql-sys:format-time 
+       nil (clsql-sys:utime->time universal-time) 
        :format :iso)
       #+ignore
       universal-time)
@@ -113,20 +113,20 @@ as possible second argument) to the desired representation of date/time/timestam
           (progn ,result-code ,@body))
          (#.$SQL_INVALID_HANDLE
           (error
-          'clsql-base:clsql-odbc-error
-          :odbc-message "Invalid handle"))
+          'clsql-sys:sql-database-error
+          :message "ODBC: Invalid handle"))
          (#.$SQL_STILL_EXECUTING
           (error
-          'clsql-base:clsql-odbc-error
-          :odbc-message "Still executing"))
+          'clsql-sys:sql-temporary-error
+          :message "ODBC: Still executing"))
          (#.$SQL_ERROR
           (multiple-value-bind (error-message sql-state)
              (handle-error (or ,henv +null-handle-ptr+)
                            (or ,hdbc +null-handle-ptr+)
                            (or ,hstmt +null-handle-ptr+))
             (error
-            'clsql-base:clsql-odbc-error
-            :odbc-message error-message
+            'clsql-sys:sql-database-error
+            :message error-message
             :sql-state sql-state)))
         (#.$SQL_NO_DATA_FOUND
          (progn ,result-code ,@body))
@@ -138,9 +138,9 @@ as possible second argument) to the desired representation of date/time/timestam
                            (or ,hdbc +null-handle-ptr+)
                            (or ,hstmt +null-handle-ptr+))
             (error
-            'clsql-base:clsql-odbc-error
-            :odbc-message error-message
-            :sql-state sql-state))
+            'clsql-sys:sql-database-error
+            :message error-message
+            :secondary-error-id sql-state))
          #+ignore
           (progn ,result-code ,@body))))))