X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=db-aodbc%2Faodbc-sql.lisp;h=f357e59b7923fce2bfab986876c2751244118a67;hb=8ee8fd019f504602519a38b78db018b5c1ec1e25;hp=bffb212ca66dae5f366b4a577aa772d5cf4e40e2;hpb=967266c94b00f91e5967b8330fe2b9134b0c0447;p=clsql.git

diff --git a/db-aodbc/aodbc-sql.lisp b/db-aodbc/aodbc-sql.lisp
index bffb212..f357e59 100644
--- a/db-aodbc/aodbc-sql.lisp
+++ b/db-aodbc/aodbc-sql.lisp
@@ -19,19 +19,16 @@
 (in-package #:clsql-aodbc)
 
 ;; interface foreign library loading routines
-(defmethod clsql-base-sys:database-type-library-loaded ((database-type (eql :aodbc)))
+(defmethod clsql-sys:database-type-library-loaded ((database-type (eql :aodbc)))
   "T if foreign library was able to be loaded successfully. "
   (when (find-package :dbi) ;; finds Allegro's DBI (AODBC) package
     t))
 
-(defmethod clsql-base-sys:database-type-load-foreign ((databae-type (eql :aodbc)))
+(defmethod clsql-sys:database-type-load-foreign ((databae-type (eql :aodbc)))
   t)
 
 (when (find-package :dbi)
-  (clsql-base-sys:database-type-load-foreign :aodbc)) 
-
-(defmethod database-initialize-database-type ((database-type (eql :aodbc)))
-  t)
+  (clsql-sys:database-type-load-foreign :aodbc)) 
 
 
 ;; AODBC interface
@@ -74,11 +71,12 @@
   (setf (database-aodbc-conn database) nil)
   t)
 
-(defmethod database-query (query-expression (database aodbc-database) result-types) 
+(defmethod database-query (query-expression (database aodbc-database) result-types field-names) 
   #+aodbc-v2
   (handler-case
       (dbi:sql query-expression :db (database-aodbc-conn database)
-	       :types result-types)
+	       :types result-types
+               :column-names field-names)
       (clsql-error (e)
 	(error e))
     (error ()
@@ -260,8 +258,7 @@
 	   (car (database-query 
 		 (concatenate 'string "SELECT last_value,is_called FROM " 
 			      table-name)
-		 database
-		 :auto))))
+		 database :auto nil))))
      (cond
        ((char-equal (schar (second tuple) 0) #\f)
 	(database-execute-command
@@ -280,8 +277,7 @@
    (caar (database-query 
 	  (concatenate 'string "SELECT last_value FROM " 
 		       (%sequence-name-to-table sequence-name))
-	  database
-	  :auto))))
+	  database :auto nil))))
 
 (defmethod database-create (connection-spec (type (eql :aodbc)))
   (warn "Not implemented."))
@@ -300,6 +296,8 @@
 (defmethod db-backend-has-create/destroy-db? ((db-type (eql :aodbc)))
   nil)
 
-#+ignore		       
-(when (clsql-base-sys:database-type-library-loaded :aodbc)
-  (clsql-base-sys:initialize-database-type :database-type :aodbc))
+(defmethod database-initialize-database-type ((database-type (eql :aodbc)))
+  t)
+
+(when (clsql-sys:database-type-library-loaded :aodbc)
+  (clsql-sys:initialize-database-type :database-type :aodbc))