X-Git-Url: http://git.kpe.io/?p=clsql.git;a=blobdiff_plain;f=db-aodbc%2Faodbc-sql.lisp;h=8cd30769a8329db74f48d0ca5e3112664218209d;hp=8a6ee00b8f630da9d6304b922ebb879c021a1ac3;hb=1b07d2fd927cf8f1943ac0a0b8c980d1dc707076;hpb=5148be446aee32ec705beac3fbba35f499df4fd4

diff --git a/db-aodbc/aodbc-sql.lisp b/db-aodbc/aodbc-sql.lisp
index 8a6ee00..8cd3076 100644
--- a/db-aodbc/aodbc-sql.lisp
+++ b/db-aodbc/aodbc-sql.lisp
@@ -34,8 +34,7 @@
 ;; AODBC interface
 
 (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)))
+  ((aodbc-db-type :accessor database-aodbc-db-type :initform :unknown)))
 
 (defmethod database-name-from-spec (connection-spec
 				    (database-type (eql :aodbc)))
@@ -53,11 +52,11 @@
 	  :name (database-name-from-spec connection-spec :aodbc)
 	  :database-type :aodbc
 	  :dbi-package (find-package '#:dbi)
-	  :aodbc-conn
+	  :odbc-conn
 	  (dbi:connect :user user
 		       :password password
 		       :data-source-name dsn))
-      (clsql-error (e)
+      (sql-error (e)
 	(error e))
       (error () 	;; Init or Connect failed
 	(error 'sql-connection-error
@@ -66,6 +65,20 @@
 	       :message "Connection failed")))))
 
 
+(defmethod database-query (query-expression (database aodbc-database) 
+			   result-types field-names)
+  #+aodbc-v2
+  (handler-case
+      (dbi:sql query-expression
+	       :db (clsql-sys::odbc-conn database)
+	       :types result-types
+	       :column-names field-names)
+    #+ignore
+    (error ()
+      (error 'sql-database-data-error
+	     :database database
+	     :expression query-expression
+	     :message "Query failed"))))
 
 (defmethod database-create (connection-spec (type (eql :aodbc)))
   (warn "Not implemented."))