r1683: *** 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..2623aed20f2944a0bc089a14a4912a66367bdf05 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.15 2002/03/27 12:09:39 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,41 @@
 
 ;;; 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)))
+  (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)