projects
/
clsql.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
0384597
)
r1698: *** empty log message ***
author
Kevin M. Rosenberg
<kevin@rosenberg.net>
Fri, 29 Mar 2002 08:28:14 +0000
(08:28 +0000)
committer
Kevin M. Rosenberg
<kevin@rosenberg.net>
Fri, 29 Mar 2002 08:28:14 +0000
(08:28 +0000)
ChangeLog
patch
|
blob
|
history
clsql-aodbc.system
patch
|
blob
|
history
clsql-postgresql-socket.system
patch
|
blob
|
history
interfaces/aodbc/aodbc-sql.cl
patch
|
blob
|
history
sql/db-interface.cl
patch
|
blob
|
history
sql/sql.cl
patch
|
blob
|
history
diff --git
a/ChangeLog
b/ChangeLog
index b9839d8be224890cbc0d4042032c978bb30b8504..96be4fcfdf29b0b4263a5a96fa3176caa92d929a 100644
(file)
--- 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
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.
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 a9a8c4a931780859168091d32f5ef9365942c6c6..a540a70e2a47b32d2e34843fb36d9106c080c757 100644
(file)
--- a/
clsql-aodbc.system
+++ b/
clsql-aodbc.system
@@
-7,7
+7,7
@@
;;;; Programmer: Kevin M. Rosenberg
;;;; Date Started: Feb 2002
;;;;
;;;; 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
;;;;
;;;;
;;;; 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
(: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 2701c368d1d6c244c53b8a3247f7e802e8eada8b..7a89a856b9d22e7b563df30f86a0f1050e6c862a 100644
(file)
--- a/
clsql-postgresql-socket.system
+++ b/
clsql-postgresql-socket.system
@@
-7,7
+7,7
@@
;;;; Programmer: Kevin M. Rosenberg
;;;; Date Started: Feb 2002
;;;;
;;;; 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
;;;;
;;;;
;;;; 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 ("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 2e83b5a89262bfd0d9dc3a51e5dd9feb8326f371..edb861ec78a32022338c0094ab3f6810a08f4ecb 100644
(file)
--- a/
interfaces/aodbc/aodbc-sql.cl
+++ b/
interfaces/aodbc/aodbc-sql.cl
@@
-7,7
+7,7
@@
;;;; Programmer: Kevin M. Rosenberg
;;;; Date Started: Feb 2002
;;;;
;;;; 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
;;;;
;;;;
;;;; 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))
(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)
(defmethod database-initialize-database-type ((database-type (eql :aodbc)))
t)
diff --git
a/sql/db-interface.cl
b/sql/db-interface.cl
index ca6a5159ef25cf3a66571e3386220c956f470188..80b9ba0c811c3fd291cbfe053d7d6560c7cc91dc 100644
(file)
--- a/
sql/db-interface.cl
+++ b/
sql/db-interface.cl
@@
-8,7
+8,7
@@
;;;; Original code by Pierre R. Mai
;;;; Date Started: Feb 2002
;;;;
;;;; 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
;;;;
;;;; 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)
(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)
(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
(defgeneric database-type-library-loaded (database-type)
(:documentation
diff --git
a/sql/sql.cl
b/sql/sql.cl
index 529925dfed98a1600b28ad67b5c28892a0cf3a41..92d0e4452aeb50185bc974003eb3b0456797f404 100644
(file)
--- a/
sql/sql.cl
+++ b/
sql/sql.cl
@@
-8,7
+8,7
@@
;;;; Original code by Pierre R. Mai
;;;; Date Started: Feb 2002
;;;;
;;;; 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
;;;;
;;;; 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*))
"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.")
(defvar *default-database-type* nil
"Specifies the default type of database. Currently only :mysql is
supported.")