r2070: *** empty log message ***

[clsql.git] / interfaces / mysql / mysql-sql.cl

diff --git a/interfaces/mysql/mysql-sql.cl b/interfaces/mysql/mysql-sql.cl
index 138cd7df1587da8220642039504aff40a89a0bf6..d608d8be3408f97d8ced5d29b79614afad2f845f 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
 ;;;;
-;;;; $Id: mysql-sql.cl,v 1.14 2002/03/27 08:09:25 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
@@ -41,37 +41,43 @@
 
 ;;; Field conversion functions
 
+(defun make-type-list-for-auto (num-fields res-ptr)
+  (let ((new-types '())
+       #+ignore (field-vec (mysql-fetch-fields res-ptr)))
+    (dotimes (i num-fields)
+      (declare (fixnum i))
+      (let* ( (field (mysql-fetch-field-direct res-ptr i))
+            #+ignore (field (uffi:deref-array field-vec 'mysql-field-vector i))
+             (type (uffi:get-slot-value field 'mysql-field 'type)))
+       (push
+        (case type
+          ((#.mysql-field-types#tiny 
+            #.mysql-field-types#short
+            #.mysql-field-types#int24
+            #.mysql-field-types#long)
+           :int32)
+          (#.mysql-field-types#longlong
+           :int64)
+          ((#.mysql-field-types#double
+            #.mysql-field-types#float
+            #.mysql-field-types#decimal)
+           :double)
+          (otherwise
+           t))
+        new-types)))
+    (nreverse new-types)))
+
 (defun canonicalize-types (types num-fields res-ptr)
-  (cond
-   ((listp types)
-    (canonicalize-type-list types num-fields))
-   ((eq types :auto)
-    (let ((new-types '())
-         #+ignore (field-vec (mysql-fetch-fields res-ptr)))
-      (dotimes (i num-fields)
-       (declare (fixnum i))
-       (let* ( (field (mysql-fetch-field-direct res-ptr i))
-               #+ignore (field (uffi:deref-array field-vec 'mysql-field-vector i))
-               (type (uffi:get-slot-value field 'mysql-field 'type)))
-         (push
-          (case type
-            ((#.mysql-field-types#tiny 
-              #.mysql-field-types#short
-              #.mysql-field-types#int24
-              #.mysql-field-types#long)
-             :int)
-            (#.mysql-field-types#longlong
-             :longlong)
-            ((#.mysql-field-types#double
-              #.mysql-field-types#float
-              #.mysql-field-types#decimal)
-             :double)
-            (otherwise
-             t))
-          new-types)))
-      (nreverse new-types)))
-   (t
-    nil)))
+  (if (null types)
+      nil
+      (let ((auto-list (make-type-list-for-auto num-fields res-ptr)))
+       (cond
+         ((listp types)
+          (canonicalize-type-list types auto-list))
+         ((eq types :auto)
+          auto-list)
+         (t
+          nil)))))
 
 (defmethod database-initialize-database-type ((database-type (eql :mysql)))
   t)
@@ -84,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
@@ -123,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)))))))))
 
@@ -246,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*))