r1670: updated mysql to handle :longlong field translation

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

diff --git a/interfaces/mysql/mysql-sql.cl b/interfaces/mysql/mysql-sql.cl
index 1850092d9ef86c89287ca518a9dd9b28f7fcf00e..9d14dc888b6c4dd3df4186cbc359281f6b4439e0 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.7 2002/03/25 06:07:06 kevin Exp $
+;;;; $Id: mysql-sql.cl,v 1.13 2002/03/27 05:37:35 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,14 +41,15 @@
 
 ;;; 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
+(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
+               (if (>= i length-types)
+                   (push t new-types) ;; types is shorted than num-fields
                  (push
                   (case (nth i types)
                     ((:int :long :double t)
@@ -56,21 +57,50 @@
                     (t
                      t))
                   new-types)))
-       (nreverse new-types))
-      (if (eq types :auto)
-         :auto
-         nil)))
+         (nreverse new-types))))
+   ((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)))
 
 (uffi:def-function "atoi"
-    ((str :cstring))
+    ((str (* :unsigned-char)))
   :returning :int)
 
 (uffi:def-function "atol"
-    ((str :cstring))
+    ((str (* :unsigned-char)))
   :returning :long)
 
+(uffi:def-function "atol64"
+    ((str (* :unsigned-char))
+     (high32 (* :int)))
+  :returning :int)
+
 (uffi:def-function "atof"
-    ((str :cstring))
+    ((str (* :unsigned-char)))
   :returning :double)
 
 (defun convert-raw-field (char-ptr types index)
@@ -84,6 +114,13 @@
        (atol char-ptr))
       (:double
        (atof char-ptr))
+      (:longlong
+       (uffi:with-foreign-object (high32-ptr :int)
+        (let ((low32 (atol64 char-ptr high32-ptr))
+              (high32 (uffi:deref-pointer high32-ptr :int)))
+          (if (zerop high32)
+              low32
+              (mysql:make-64-bit-integer high32 low32)))))
       (otherwise
        (uffi:convert-from-foreign-string char-ptr)))))
 
@@ -148,23 +185,25 @@
 
 
 (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
@@ -192,14 +231,14 @@
 (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))
@@ -214,9 +253,10 @@
                                    :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
@@ -243,7 +283,7 @@
 (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)
@@ -253,7 +293,7 @@
            (setf (car rest) 
                  (convert-raw-field
                   (uffi:deref-array row 'mysql-row i)
-                  field-types
+                  types
                   i)))
       list)))