projects
/
clsql.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
0ba06f8
)
r2033: move initialize code for better .system compilation
author
Kevin M. Rosenberg
<kevin@rosenberg.net>
Mon, 13 May 2002 22:05:21 +0000
(22:05 +0000)
committer
Kevin M. Rosenberg
<kevin@rosenberg.net>
Mon, 13 May 2002 22:05:21 +0000
(22:05 +0000)
clsql-aodbc.system
patch
|
blob
|
history
clsql-mysql.system
patch
|
blob
|
history
clsql-postgresql-socket.system
patch
|
blob
|
history
clsql-postgresql.system
patch
|
blob
|
history
interfaces/aodbc/aodbc-sql.cl
patch
|
blob
|
history
interfaces/mysql/mysql-loader.cl
patch
|
blob
|
history
interfaces/postgresql-socket/postgresql-socket-sql.cl
patch
|
blob
|
history
interfaces/postgresql/postgresql-loader.cl
patch
|
blob
|
history
diff --git
a/clsql-aodbc.system
b/clsql-aodbc.system
index 985a7ca7cb4679e20c3b2ed01212071bd0f2a812..c6397d97fdf881ff391741afe991cdc98d0820fd 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.
3 2002/04/01 05:27:54
kevin Exp $
+;;;; $Id: clsql-aodbc.system,v 1.
4 2002/05/13 22:05:20
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,9
+25,6
@@
:binary-pathname "CLSQL:interfaces;aodbc;bin;"
:components ((:file "aodbc-package")
(:file "aodbc-sql" :depends-on ("aodbc-package")))
:binary-pathname "CLSQL:interfaces;aodbc;bin;"
:components ((:file "aodbc-package")
(:file "aodbc-sql" :depends-on ("aodbc-package")))
- :depends-on (:clsql)
- :finally-do
- (when (clsql-sys:database-type-library-loaded :aodbc)
- (clsql-sys:initialize-database-type :database-type :aodbc)))
+ :depends-on (:clsql))
diff --git
a/clsql-mysql.system
b/clsql-mysql.system
index 2a3f9f3b2b7f7e824a6e7b5283134cbffa89a4e5..bdf5aa68fe10a4e8bc166aaf19fff6cbb0a099da 100644
(file)
--- a/
clsql-mysql.system
+++ b/
clsql-mysql.system
@@
-7,7
+7,7
@@
;;;; Programmer: Kevin M. Rosenberg
\r
;;;; Date Started: Feb 2002
\r
;;;;
\r
;;;; Programmer: Kevin M. Rosenberg
\r
;;;; Date Started: Feb 2002
\r
;;;;
\r
-;;;; $Id: clsql-mysql.system,v 1.
8 2002/05/13 21:50:52
kevin Exp $
\r
+;;;; $Id: clsql-mysql.system,v 1.
9 2002/05/13 22:05:20
kevin Exp $
\r
;;;;
\r
;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
\r
;;;;
\r
;;;;
\r
;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
\r
;;;;
\r
@@
-18,7
+18,7
@@
\r
(declaim (optimize (debug 3) (speed 3) (safety 1) (compilation-speed 0)))
\r
\r
\r
(declaim (optimize (debug 3) (speed 3) (safety 1) (compilation-speed 0)))
\r
\r
-(in-package :cl
sql-sys
)
\r
+(in-package :cl
-user
)
\r
\r
;;; System definition
\r
\r
\r
;;; System definition
\r
\r
@@
-31,12
+31,8
@@
(:file "mysql-api" :depends-on ("mysql-loader"))
\r
(:file "mysql-sql" :depends-on ("mysql-api"))
\r
(:file "mysql-usql" :depends-on ("mysql-sql")))
\r
(:file "mysql-api" :depends-on ("mysql-loader"))
\r
(:file "mysql-sql" :depends-on ("mysql-api"))
\r
(:file "mysql-usql" :depends-on ("mysql-sql")))
\r
- :depends-on (:uffi :clsql-base :clsql-uffi)
\r
- :finally-do
\r
- (when (clsql-sys:database-type-library-loaded :mysql)
\r
- (clsql-sys:initialize-database-type :database-type :mysql)
\r
- (setq clsql:*default-database-type* :mysql)
\r
- (pushnew :mysql cl:*features*)))
\r
+ :depends-on (:uffi :clsql-base :clsql-uffi))
\r
+
\r
\r
\r
\r
\r
\r
\r
diff --git
a/clsql-postgresql-socket.system
b/clsql-postgresql-socket.system
index 197b289023ecb9c26e708263fe414aab98095c33..aa35889c528c60727ec5985bdbab85eb617401a6 100644
(file)
--- a/
clsql-postgresql-socket.system
+++ b/
clsql-postgresql-socket.system
@@
-7,7
+7,7
@@
;;;; Programmer: Kevin M. Rosenberg
\r
;;;; Date Started: Feb 2002
\r
;;;;
\r
;;;; Programmer: Kevin M. Rosenberg
\r
;;;; Date Started: Feb 2002
\r
;;;;
\r
-;;;; $Id: clsql-postgresql-socket.system,v 1.
6 2002/05/13 00:45:1
0 kevin Exp $
\r
+;;;; $Id: clsql-postgresql-socket.system,v 1.
7 2002/05/13 22:05:2
0 kevin Exp $
\r
;;;;
\r
;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
\r
;;;;
\r
;;;;
\r
;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
\r
;;;;
\r
@@
-30,7
+30,4
@@
:depends-on ("postgresql-socket-package"))
\r
(:file "postgresql-socket-sql"
\r
:depends-on ("postgresql-socket-api")))
\r
:depends-on ("postgresql-socket-package"))
\r
(:file "postgresql-socket-sql"
\r
:depends-on ("postgresql-socket-api")))
\r
- :depends-on (:clsql-base :uffi)
\r
- :finally-do
\r
- (when (clsql-sys:database-type-library-loaded :postgresql-socket)
\r
- (clsql-sys:initialize-database-type :database-type :postgresql-socket)))
\r
+ :depends-on (:clsql-base :uffi))
\r
diff --git
a/clsql-postgresql.system
b/clsql-postgresql.system
index d84a1021e6a267cc9cc2809195d53001a3353580..13c840d7e294d44f2ee5c4206ada28094bc61d8f 100644
(file)
--- a/
clsql-postgresql.system
+++ b/
clsql-postgresql.system
@@
-7,7
+7,7
@@
;;;; Programmer: Kevin M. Rosenberg
\r
;;;; Date Started: Feb 2002
\r
;;;;
\r
;;;; Programmer: Kevin M. Rosenberg
\r
;;;; Date Started: Feb 2002
\r
;;;;
\r
-;;;; $Id: clsql-postgresql.system,v 1.
6 2002/05/13 00:45:1
0 kevin Exp $
\r
+;;;; $Id: clsql-postgresql.system,v 1.
7 2002/05/13 22:05:2
0 kevin Exp $
\r
;;;;
\r
;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
\r
;;;;
\r
;;;;
\r
;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
\r
;;;;
\r
@@
-29,9
+29,5
@@
(:file "postgresql-api" :depends-on ("postgresql-loader"))
\r
(:file "postgresql-sql" :depends-on ("postgresql-api"))
\r
(:file "postgresql-usql" :depends-on ("postgresql-sql")))
\r
(:file "postgresql-api" :depends-on ("postgresql-loader"))
\r
(:file "postgresql-sql" :depends-on ("postgresql-api"))
\r
(:file "postgresql-usql" :depends-on ("postgresql-sql")))
\r
- :depends-on (:uffi :clsql-base :clsql-uffi)
\r
- :finally-do
\r
- (when (clsql-sys:database-type-library-loaded :postgresql)
\r
- (clsql-sys:initialize-database-type :database-type :postgresql)
\r
- (pushnew :postgresql cl:*features*)))
\r
+ :depends-on (:uffi :clsql-base :clsql-uffi))
\r
\r
\r
diff --git
a/interfaces/aodbc/aodbc-sql.cl
b/interfaces/aodbc/aodbc-sql.cl
index 9cc69ece71ae3cf80f54e5e79f729259da057ce2..e493918aec218ee2260602c580c41f36191b09cb 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.
9 2002/05/13 16:41:22
kevin Exp $
+;;;; $Id: aodbc-sql.cl,v 1.
10 2002/05/13 22:05:21
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
;;;;
@@
-146,3
+146,5
@@
list))))
list))))
+(when (clsql-sys:database-type-library-loaded :aodbc)
+ (clsql-sys:initialize-database-type :database-type :aodbc))
diff --git
a/interfaces/mysql/mysql-loader.cl
b/interfaces/mysql/mysql-loader.cl
index 65e06a178922e642f781233ad875cacc3e5cbae2..7434670da5a235391e45b2e3d2ed5506c7710bfe 100644
(file)
--- a/
interfaces/mysql/mysql-loader.cl
+++ b/
interfaces/mysql/mysql-loader.cl
@@
-7,7
+7,7
@@
;;;; Programmers: Kevin M. Rosenberg
;;;; Date Started: Feb 2002
;;;;
;;;; Programmers: Kevin M. Rosenberg
;;;; Date Started: Feb 2002
;;;;
-;;;; $Id: mysql-loader.cl,v 1.
7 2002/05/13 21:50:52
kevin Exp $
+;;;; $Id: mysql-loader.cl,v 1.
8 2002/05/13 22:05:21
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
;;;;
@@
-89,5
+89,7
@@
set to the right path before compiling or loading the system.")
(clsql-sys:database-type-load-foreign :mysql)
(clsql-sys:database-type-load-foreign :mysql)
-
-
+(when (clsql-sys:database-type-library-loaded :mysql)
+ (clsql-sys:initialize-database-type :database-type :mysql)
+ (setq clsql:*default-database-type* :mysql)
+ (pushnew :mysql cl:*features*))
diff --git
a/interfaces/postgresql-socket/postgresql-socket-sql.cl
b/interfaces/postgresql-socket/postgresql-socket-sql.cl
index 777a0957a309b31d7acccd144fbd21e77d88b352..6c517f1a18623e7b4c3f4e6aa4d0f1146326a5a7 100644
(file)
--- a/
interfaces/postgresql-socket/postgresql-socket-sql.cl
+++ b/
interfaces/postgresql-socket/postgresql-socket-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: postgresql-socket-sql.cl,v 1.1
1 2002/04/27 20:58:1
1 kevin Exp $
+;;;; $Id: postgresql-socket-sql.cl,v 1.1
2 2002/05/13 22:05:2
1 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
@@
-304,3
+304,6
@@
doesn't depend on UFFI."
(prog1 nil
(setf (postgresql-socket-result-set-done result-set) t)
(wait-for-query-results (database-connection database)))))))
(prog1 nil
(setf (postgresql-socket-result-set-done result-set) t)
(wait-for-query-results (database-connection database)))))))
+
+(when (clsql-sys:database-type-library-loaded :postgresql-socket)
+ (clsql-sys:initialize-database-type :database-type :postgresql-socket))
diff --git
a/interfaces/postgresql/postgresql-loader.cl
b/interfaces/postgresql/postgresql-loader.cl
index 46e84084ec96b425c49a0b64b29148da9cf5b407..30cff4f813112d4a548a57a12d9f43ea1091a7e7 100644
(file)
--- a/
interfaces/postgresql/postgresql-loader.cl
+++ b/
interfaces/postgresql/postgresql-loader.cl
@@
-7,7
+7,7
@@
;;;; Programmer: Kevin M. Rosenberg
;;;; Date Started: Feb 2002
;;;;
;;;; Programmer: Kevin M. Rosenberg
;;;; Date Started: Feb 2002
;;;;
-;;;; $Id: postgresql-loader.cl,v 1.
6 2002/04/08 01:22:02
kevin Exp $
+;;;; $Id: postgresql-loader.cl,v 1.
7 2002/05/13 22:05:21
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
;;;;
@@
-49,3
+49,6
@@
set to the right path before compiling or loading the system.")
(setq *postgresql-library-loaded* t)))
(clsql-sys:database-type-load-foreign :postgresql)
(setq *postgresql-library-loaded* t)))
(clsql-sys:database-type-load-foreign :postgresql)
+(when (clsql-sys:database-type-library-loaded :postgresql)
+ (clsql-sys:initialize-database-type :database-type :postgresql)
+ (pushnew :postgresql cl:*features*))