r9447: * sql/*.lisp: Add db-type parameter to generic functions READ-SQL...

[clsql.git] / db-aodbc / aodbc-sql.lisp

diff --git a/db-aodbc/aodbc-sql.lisp b/db-aodbc/aodbc-sql.lisp
index f357e59b7923fce2bfab986876c2751244118a67..4d83206945bb5b9881d06f21e88afbd6cb6829d8 100644 (file)
--- a/db-aodbc/aodbc-sql.lisp
+++ b/db-aodbc/aodbc-sql.lisp
@@ -33,7 +33,7 @@
 
 ;; AODBC interface
 
-(defclass aodbc-database (database)
+(defclass aodbc-database (generic-odbc-database)
   ((aodbc-conn :accessor database-aodbc-conn :initarg :aodbc-conn)
    (aodbc-db-type :accessor database-aodbc-db-type :initform :unknown)))
 
@@ -59,11 +59,10 @@
       (clsql-error (e)
        (error e))
       (error ()        ;; Init or Connect failed
-       (error 'clsql-connect-error
+       (error 'sql-connection-error
               :database-type database-type
               :connection-spec connection-spec
-              :errno nil
-              :error "Connection failed")))))
+              :message "Connection failed")))))
 
 (defmethod database-disconnect ((database aodbc-database))
   #+aodbc-v2
@@ -80,11 +79,10 @@
       (clsql-error (e)
        (error e))
     (error ()
-      (error 'clsql-sql-error
+      (error 'sql-database-data-error
             :database database
             :expression query-expression
-            :errno nil
-            :error "Query failed"))))
+            :message "Query failed."))))
 
 (defmethod database-execute-command (sql-expression 
                                     (database aodbc-database))
@@ -94,11 +92,10 @@
       (clsql-error (e)
        (error e))
     (error ()
-      (error 'clsql-sql-error
+      (error 'sql-database-data-error
             :database database
             :expression sql-expression
-            :errno nil
-            :error "Execute command failed"))))
+            :error "Execute command failed."))))
 
 (defstruct aodbc-result-set
   (query nil)
@@ -127,11 +124,10 @@
       (clsql-error (e)
        (error e))
     (error ()
-      (error 'clsql-sql-error
+      (error 'sql-database-data-error
             :database database
             :expression query-expression
-            :errno nil
-            :error "Query result set failed"))))
+            :error "Query result set failed."))))
 
 (defmethod database-dump-result-set (result-set (database aodbc-database))
   #+aodbc-v2