X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=interfaces%2Fmysql%2Fmysql-sql.cl;h=d608d8be3408f97d8ced5d29b79614afad2f845f;hb=cdd84f18473361ae5220666bbe0526fa565bc060;hp=7bd3bb9a0560a49512fe0896f0c0621932e51899;hpb=c31eca44f939816749f382f5a449bfee07eecf86;p=clsql.git

diff --git a/interfaces/mysql/mysql-sql.cl b/interfaces/mysql/mysql-sql.cl
index 7bd3bb9..d608d8b 100644
--- 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
 ;;;;
-;;;; $Id: mysql-sql.cl,v 1.17 2002/03/29 14:03:27 kevin Exp $
+;;;; $Id: mysql-sql.cl,v 1.21 2002/05/25 15:57:28 kevin Exp $
 ;;;;
 ;;;; 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
-	 ((listp types)
-	  (canonicalize-type-list types auto-list))
-	  types)
+	  ((listp types)
+	   (canonicalize-type-list types auto-list))
 	  ((eq types :auto)
 	   auto-list)
 	  (t
-	   nil))))
+	   nil)))))
 
 (defmethod database-initialize-database-type ((database-type (eql :mysql)))
   t)
@@ -91,13 +90,15 @@
   ((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
     (declare (ignore password))
     (concatenate 'string host "/" db "/" user)))
 
-
 (defmethod database-connect (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 +131,7 @@
 		  (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)))))))))
 
@@ -253,3 +255,7 @@
       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*))