X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=interfaces%2Faodbc%2Faodbc-sql.cl;h=edb861ec78a32022338c0094ab3f6810a08f4ecb;hb=1a44400b42310a985f1a27ea8f53da84716955e1;hp=e3eedb54a565b1f784e1c00b77c4bf43e2314fdb;hpb=01e78fad2d9c4c18f11ec032c80afa59212ba109;p=clsql.git

diff --git a/interfaces/aodbc/aodbc-sql.cl b/interfaces/aodbc/aodbc-sql.cl
index e3eedb5..edb861e 100644
--- a/interfaces/aodbc/aodbc-sql.cl
+++ b/interfaces/aodbc/aodbc-sql.cl
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id: aodbc-sql.cl,v 1.3 2002/03/24 18:08:27 kevin Exp $
+;;;; $Id: aodbc-sql.cl,v 1.7 2002/03/29 08:23:38 kevin Exp $
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -25,6 +25,12 @@
   (when (find-package :dbi) ;; finds Allegro's DBI (AODBC) package
     t))
 
+(defmethod clsql-sys:database-type-load-foreign ((databae-type (eql :aodbc)))
+  t)
+
+(when (find-package :dbi)
+  (clsql-sys:database-type-load-foreign :aodbc)) ;; doesn't do anything
+
 (defmethod database-initialize-database-type ((database-type (eql :aodbc)))
   t)
 
@@ -60,9 +66,10 @@
   (setf (database-aodbc-conn database) nil)
   t)
 
-(defmethod database-query (query-expression (database aodbc-database) field-types) 
+(defmethod database-query (query-expression (database aodbc-database) types) 
   (handler-case
-      (dbi:sql query-expression :db (database-aodbc-conn database))
+      (dbi:sql query-expression :db (database-aodbc-conn database)
+	       :types types)
     (error ()
       (error 'clsql-sql-error
 	     :database database
@@ -83,11 +90,11 @@
 
 (defstruct aodbc-result-set
   (query nil)
-  (field-types nil :type cons)
+  (types nil :type cons)
   (full-set nil :type boolean))
 
 (defmethod database-query-result-set (query-expression (database aodbc-database) 
-				      &key full-set field-types)
+				      &key full-set types)
   (handler-case 
       (multiple-value-bind (query column-names)
 	  (dbi:sql query-expression 
@@ -95,9 +102,11 @@
 		   :row-count nil
 		   :column-names t
 		   :query t
+		   :types types
 		   )
 	(values
-	 (make-aodbc-result-set :query query :full-set full-set)
+	 (make-aodbc-result-set :query query :full-set full-set 
+				:types types)
 	 (length column-names)
 	 nil ;; not able to return number of rows with aodbc
 	 ))