projects
/
clsql.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r2046: Debian build
[clsql.git]
/
interfaces
/
mysql
/
mysql-sql.cl
diff --git
a/interfaces/mysql/mysql-sql.cl
b/interfaces/mysql/mysql-sql.cl
index 7bd3bb9a0560a49512fe0896f0c0621932e51899..ca8225b33660f5dd1cb436367c235bff4ba02da7 100644
(file)
--- a/
interfaces/mysql/mysql-sql.cl
+++ b/
interfaces/mysql/mysql-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: mysql-sql.cl,v 1.
17 2002/03/29 14:03:27
kevin Exp $
+;;;; $Id: mysql-sql.cl,v 1.
20 2002/05/14 16:29:53
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
@@
-72,13
+72,12
@@
nil
(let ((auto-list (make-type-list-for-auto num-fields res-ptr)))
(cond
nil
(let ((auto-list (make-type-list-for-auto num-fields res-ptr)))
(cond
- ((listp types)
- (canonicalize-type-list types auto-list))
- types)
+ ((listp types)
+ (canonicalize-type-list types auto-list))
((eq types :auto)
auto-list)
(t
((eq types :auto)
auto-list)
(t
- nil))))
+ nil))))
)
(defmethod database-initialize-database-type ((database-type (eql :mysql)))
t)
(defmethod database-initialize-database-type ((database-type (eql :mysql)))
t)
@@
-91,6
+90,9
@@
((mysql-ptr :accessor database-mysql-ptr :initarg :mysql-ptr
:type mysql-mysql-ptr-def)))
((mysql-ptr :accessor database-mysql-ptr :initarg :mysql-ptr
:type mysql-mysql-ptr-def)))
+(defmethod database-type ((database mysql-database))
+ :mysql)
+
(defmethod database-name-from-spec (connection-spec (database-type (eql :mysql)))
(check-connection-spec connection-spec database-type (host db user password))
(destructuring-bind (host db user password) connection-spec
(defmethod database-name-from-spec (connection-spec (database-type (eql :mysql)))
(check-connection-spec connection-spec database-type (host db user password))
(destructuring-bind (host db user password) connection-spec
@@
-130,6
+132,7
@@
(make-instance 'mysql-database
:name (database-name-from-spec connection-spec
database-type)
(make-instance 'mysql-database
:name (database-name-from-spec connection-spec
database-type)
+ :connection-spec connection-spec
:mysql-ptr mysql-ptr))
(when error-occurred (mysql-close mysql-ptr)))))))))
:mysql-ptr mysql-ptr))
(when error-occurred (mysql-close mysql-ptr)))))))))
@@
-253,3
+256,7
@@
list)))
list)))
+(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*))