r1673: *** 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 32db9b64bac4131353610db423c632b55a8250d5..138cd7df1587da8220642039504aff40a89a0bf6 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.11 2002/03/27 00:25:03 kevin Exp $
+;;;; $Id: mysql-sql.cl,v 1.14 2002/03/27 08:09:25 kevin Exp $
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;; and Copyright (c) 1999-2001 by Pierre R. Mai
@@ -33,7 +33,7 @@
 ;;;; 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."))
 
@@ -43,21 +43,8 @@
 
 (defun canonicalize-types (types num-fields res-ptr)
   (cond
-   ((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))))
+   ((listp types)
+    (canonicalize-type-list types num-fields))
    ((eq types :auto)
     (let ((new-types '())
          #+ignore (field-vec (mysql-fetch-fields res-ptr)))
@@ -73,6 +60,8 @@
               #.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)
@@ -84,32 +73,6 @@
    (t
     nil)))
 
-(uffi:def-function "atoi"
-    ((str (* :unsigned-char)))
-  :returning :int)
-
-(uffi:def-function "atol"
-    ((str (* :unsigned-char)))
-  :returning :long)
-
-(uffi:def-function "atof"
-    ((str (* :unsigned-char)))
-  :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)))))
-
 (defmethod database-initialize-database-type ((database-type (eql :mysql)))
   t)
 
@@ -187,8 +150,9 @@
                              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
@@ -264,7 +228,6 @@
   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))