X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=interfaces%2Faodbc%2Faodbc-sql.cl;h=5eaa960da3d81b6befe01a77196dd9ef5325e3ab;hb=9f3761f57371f7d347e25d635735dcbf536e652c;hp=2e83b5a89262bfd0d9dc3a51e5dd9feb8326f371;hpb=21a11d58a1d421db0c53a063178dd2bc02663a15;p=clsql.git

diff --git a/interfaces/aodbc/aodbc-sql.cl b/interfaces/aodbc/aodbc-sql.cl
index 2e83b5a..5eaa960 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.6 2002/03/25 23:48:46 kevin Exp $
+;;;; $Id: aodbc-sql.cl,v 1.11 2002/05/27 17:19:30 kevin Exp $
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -20,14 +20,24 @@
 (in-package :clsql-aodbc)
 
 
+;; interface foreign library loading routines
 (defmethod 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)))
+  t)
+
+(when (find-package :dbi)
+  (clsql-base-sys:database-type-load-foreign :aodbc)) 
+
 (defmethod database-initialize-database-type ((database-type (eql :aodbc)))
   t)
 
+
+;; AODBC interface
+
 (defclass aodbc-database (database)
   ((aodbc-conn :accessor database-aodbc-conn :initarg :aodbc-conn)))
 
@@ -40,6 +50,7 @@
 
 (defmethod database-connect (connection-spec (database-type (eql :aodbc)))
   (check-connection-spec connection-spec database-type (dsn user password))
+  #+aodbc-v2
   (destructuring-bind (dsn user password) connection-spec
     (handler-case
 	(make-instance 'aodbc-database
@@ -56,11 +67,13 @@
 	       :error "Connection failed")))))
 
 (defmethod database-disconnect ((database aodbc-database))
+  #+aodbc-v2
   (dbi:disconnect (database-aodbc-conn database))
   (setf (database-aodbc-conn database) nil)
   t)
 
 (defmethod database-query (query-expression (database aodbc-database) types) 
+  #+aodbc-v2
   (handler-case
       (dbi:sql query-expression :db (database-aodbc-conn database)
 	       :types types)
@@ -73,6 +86,7 @@
 
 (defmethod database-execute-command (sql-expression 
 				     (database aodbc-database))
+  #+aodbc-v2
   (handler-case
       (dbi:sql sql-expression :db (database-aodbc-conn database))
     (error ()
@@ -89,6 +103,7 @@
 
 (defmethod database-query-result-set (query-expression (database aodbc-database) 
 				      &key full-set types)
+  #+aodbc-v2
   (handler-case 
       (multiple-value-bind (query column-names)
 	  (dbi:sql query-expression 
@@ -112,12 +127,14 @@
 	     :error "Query result set failed"))))
 
 (defmethod database-dump-result-set (result-set (database aodbc-database))
+  #+aodbc-v2
   (dbi:close-query (aodbc-result-set-query result-set))
   t)
 
 (defmethod database-store-next-row (result-set
 				    (database aodbc-database)
 				    list)
+  #+aodbc-v2
   (let ((row (dbi:fetch-row (aodbc-result-set-query result-set) nil 'eof)))
     (if (eq row 'eof)
 	nil
@@ -129,3 +146,5 @@
 	list))))
 
 		       
+(when (clsql-base-sys:database-type-library-loaded :aodbc)
+  (clsql-base-sys:initialize-database-type :database-type :aodbc))