From 1a44400b42310a985f1a27ea8f53da84716955e1 Mon Sep 17 00:00:00 2001
From: "Kevin M. Rosenberg" <kevin@rosenberg.net>
Date: Fri, 29 Mar 2002 08:28:14 +0000
Subject: [PATCH] r1698: *** empty log message ***

---
 ChangeLog                      | 4 +++-
 clsql-aodbc.system             | 7 +++++--
 clsql-postgresql-socket.system | 7 +++++--
 interfaces/aodbc/aodbc-sql.cl  | 8 +++++++-
 sql/db-interface.cl            | 6 +++---
 sql/sql.cl                     | 3 +--
 6 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b9839d8..96be4fc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
 29 Mar 2002 Kevin Rosenberg (kevin@rosenberg.net)
 	* Separated db-interface and conditions from sql/sql.cl
- 
+
+	* Improved foreign library loading testing
+	
 27 Mar 2002 Kevin Rosenberg (kevin@rosenberg.net)
 	* interfaces/postgresql-socket/postgresql-socket-api.cl:
 	Fixes to read-double-from-socket. Added 64-bit integer support.
diff --git a/clsql-aodbc.system b/clsql-aodbc.system
index a9a8c4a..a540a70 100644
--- a/clsql-aodbc.system
+++ b/clsql-aodbc.system
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id: clsql-aodbc.system,v 1.1 2002/03/23 14:04:49 kevin Exp $
+;;;; $Id: clsql-aodbc.system,v 1.2 2002/03/29 08:23:38 kevin Exp $
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -27,4 +27,7 @@
 		 (:file "aodbc-sql" :depends-on ("aodbc-package")))
     :depends-on (:clsql)
     :finally-do
-    (clsql-sys:initialize-database-type :database-type :aodbc))
+    (when (clsql-sys:database-type-library-loaded :aodbc)
+      (clsql-sys:initialize-database-type :database-type :aodbc)))
+
+    
diff --git a/clsql-postgresql-socket.system b/clsql-postgresql-socket.system
index 2701c36..7a89a85 100644
--- a/clsql-postgresql-socket.system
+++ b/clsql-postgresql-socket.system
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id: clsql-postgresql-socket.system,v 1.2 2002/03/23 17:10:47 kevin Exp $
+;;;; $Id: clsql-postgresql-socket.system,v 1.3 2002/03/29 08:28:14 kevin Exp $
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -30,4 +30,7 @@
 			:depends-on ("postgresql-socket-package"))
 		 (:file "postgresql-socket-sql"
 			:depends-on ("postgresql-socket-api")))
-    :depends-on (:clsql))
+    :depends-on (:clsql)
+    :finally-do
+    (when (clsql-sys:database-type-library-loaded :postgresql-socket)
+      (clsql-sys:initialize-database-type :database-type :postgresql-socket)))
diff --git a/interfaces/aodbc/aodbc-sql.cl b/interfaces/aodbc/aodbc-sql.cl
index 2e83b5a..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.6 2002/03/25 23:48:46 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)
 
diff --git a/sql/db-interface.cl b/sql/db-interface.cl
index ca6a515..80b9ba0 100644
--- a/sql/db-interface.cl
+++ b/sql/db-interface.cl
@@ -8,7 +8,7 @@
 ;;;;                 Original code by Pierre R. Mai 
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id: db-interface.cl,v 1.2 2002/03/29 08:12:16 kevin Exp $
+;;;; $Id: db-interface.cl,v 1.3 2002/03/29 08:23:38 kevin Exp $
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;; and Copyright (c) 1999-2001 by Pierre R. Mai
@@ -21,12 +21,12 @@
 (declaim (optimize (debug 3) (speed 3) (safety 1) (compilation-speed 0)))
 (in-package :clsql-sys)
 
-
 (defgeneric database-type-load-foreign (database-type)
   (:documentation
    "The internal generic implementation of reload-database-types.")
   (:method :after (database-type)
-	   (pushnew database-type *loaded-database-types*)))
+	   (when (database-type-library-loaded database-type)
+	     (pushnew database-type *loaded-database-types*))))
 
 (defgeneric database-type-library-loaded (database-type)
   (:documentation
diff --git a/sql/sql.cl b/sql/sql.cl
index 529925d..92d0e44 100644
--- a/sql/sql.cl
+++ b/sql/sql.cl
@@ -8,7 +8,7 @@
 ;;;;                 Original code by Pierre R. Mai 
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id: sql.cl,v 1.9 2002/03/29 08:12:16 kevin Exp $
+;;;; $Id: sql.cl,v 1.10 2002/03/29 08:23:38 kevin Exp $
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;; and Copyright (c) 1999-2001 by Pierre R. Mai
@@ -39,7 +39,6 @@
   "Reloads any foreign code for the loaded database types after a dump."
   (mapc #'database-type-load-foreign *loaded-database-types*))
 
-
 (defvar *default-database-type* nil
   "Specifies the default type of database.  Currently only :mysql is
 supported.")
-- 
2.34.1