;;;; Original code by Pierre R. Mai
;;;; Date Started: Feb 2002
;;;;
-;;;; $Id: mysql-sql.cl,v 1.7 2002/03/25 06:07:06 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
;;;; Added field types
(defpackage :clsql-mysql
- (:use :common-lisp :clsql-sys :mysql)
+ (:use :common-lisp :clsql-sys :mysql :clsql-uffi)
(:export #:mysql-database)
(:documentation "This is the CLSQL interface to MySQL."))
;;; Field conversion functions
-(defun canonicalize-field-types (types num-fields)
- (if (listp types)
- (let ((length-types (length types))
- new-types)
- (loop for i from 0 below num-fields
- do
- (if (>= i length-types)
- (push t new-types) ;; types is shorted than num-fields
- (push
- (case (nth i types)
- ((:int :long :double t)
- (nth i types))
- (t
- t))
- new-types)))
- (nreverse new-types))
- (if (eq types :auto)
- :auto
- nil)))
-
-(uffi:def-function "atoi"
- ((str :cstring))
- :returning :int)
-
-(uffi:def-function "atol"
- ((str :cstring))
- :returning :long)
-
-(uffi:def-function "atof"
- ((str :cstring))
- :returning :double)
-
-(defun convert-raw-field (char-ptr types index)
- (let ((type (if (listp types)
- (nth index types)
- types)))
- (case type
- (:int
- (atoi char-ptr))
- (:long
- (atol char-ptr))
- (:double
- (atof char-ptr))
- (otherwise
- (uffi:convert-from-foreign-string char-ptr)))))
+(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)
+ (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)
(defmethod database-query (query-expression (database mysql-database)
- field-types)
+ types)
(with-slots (mysql-ptr) database
(uffi:with-cstring (query-native query-expression)
(if (zerop (mysql-query mysql-ptr query-native))
(let ((res-ptr (mysql-use-result mysql-ptr)))
(if res-ptr
(let ((num-fields (mysql-num-fields res-ptr)))
- (setq field-types (canonicalize-field-types
- field-types num-fields))
+ (setq types (canonicalize-types
+ types num-fields
+ res-ptr))
(unwind-protect
(loop for row = (mysql-fetch-row res-ptr)
until (uffi:null-pointer-p row)
collect
(loop for i from 0 below num-fields
collect
- (uffi:convert-from-foreign-string
- (uffi:deref-array row 'mysql-row i))))
+ (convert-raw-field
+ (uffi:deref-array row 'mysql-row i)
+ types i)))
(mysql-free-result res-ptr)))
(error 'clsql-sql-error
:database database
(defstruct mysql-result-set
(res-ptr (uffi:make-null-pointer 'mysql-mysql-res)
:type mysql-mysql-res-ptr-def)
- (field-types nil)
+ (types nil)
(num-fields nil :type fixnum)
(full-set nil :type boolean))
(defmethod database-query-result-set (query-expression
(database mysql-database)
- &key full-set field-types)
+ &key full-set types)
(uffi:with-cstring (query-native query-expression)
(let ((mysql-ptr (database-mysql-ptr database)))
(declare (type mysql-mysql-ptr-def mysql-ptr))
:res-ptr res-ptr
:num-fields num-fields
:full-set full-set
- :field-types
- (canonicalize-field-types
- field-types num-fields))))
+ :types
+ (canonicalize-types
+ types num-fields
+ res-ptr))))
(if full-set
(values result-set
num-fields
t)
-
(defmethod database-store-next-row (result-set (database mysql-database) list)
(let* ((res-ptr (mysql-result-set-res-ptr result-set))
(row (mysql-fetch-row res-ptr))
- (field-types (mysql-result-set-field-types result-set)))
+ (types (mysql-result-set-types result-set)))
(declare (type mysql-mysql-res-ptr-def res-ptr)
(type mysql-row-def row))
(unless (uffi:null-pointer-p row)
(setf (car rest)
(convert-raw-field
(uffi:deref-array row 'mysql-row i)
- field-types
+ types
i)))
list)))
projects / clsql.git / blobdiff