X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=interfaces%2Fmysql%2Fmysql-sql.cl;h=264c71b51fff17fed48baa4221db803fe031c946;hb=f8478421f5a0440246f70aa4234ff25f416be7e3;hp=9d14dc888b6c4dd3df4186cbc359281f6b4439e0;hpb=8e83690d8dc88baafeb75f5b48a80a6c0e6a89c3;p=clsql.git

diff --git a/interfaces/mysql/mysql-sql.cl b/interfaces/mysql/mysql-sql.cl
index 9d14dc8..264c71b 100644
--- 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.13 2002/03/27 05:37:35 kevin Exp $
+;;;; $Id: mysql-sql.cl,v 1.19 2002/04/27 20:58:11 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."))
 
@@ -41,88 +41,43 @@
 
 ;;; Field conversion functions
 
-(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))))
-   ((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 (* :unsigned-char)))
-  :returning :int)
-
-(uffi:def-function "atol"
-    ((str (* :unsigned-char)))
-  :returning :long)
-
-(uffi:def-function "atol64"
-    ((str (* :unsigned-char))
-     (high32 (* :int)))
-  :returning :int)
+(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)))
 
-(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))
-      (: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)))))
+(defun canonicalize-types (types num-fields res-ptr)
+  (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)
@@ -135,6 +90,9 @@
   ((mysql-ptr :accessor database-mysql-ptr :initarg :mysql-ptr
 	      :type mysql-mysql-ptr-def)))
 
+(defmethod database-type ((database mysql-database))
+  :mysql)
+
 (defmethod database-name-from-spec (connection-spec (database-type (eql :mysql)))
   (check-connection-spec connection-spec database-type (host db user password))
   (destructuring-bind (host db user password) connection-spec
@@ -174,6 +132,7 @@
 		  (make-instance 'mysql-database
 		    :name (database-name-from-spec connection-spec
 						   database-type)
+		    :connection-spec connection-spec
 		    :mysql-ptr mysql-ptr))
 	      (when error-occurred (mysql-close mysql-ptr)))))))))
 
@@ -279,7 +238,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))