;;;; 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.18 2002/03/30 05:07:02 kevin Exp $
;;;;
;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
;;;; and Copyright (c) 1999-2001 by Pierre R. Mai
;;; 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)