X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=interfaces%2Fmysql%2Fmysql-sql.cl;h=65f2f6ff994051d0ab3c8f793d767eb21b95f7cc;hb=33401393ccc0a9567da4104b3c2e7608956a8624;hp=878033c6d4a1d7cadb99a7a5f95b47608a4c99c2;hpb=9a78eef71c902d3b272fb7c777bff6dd0acd8a2b;p=clsql.git

diff --git a/interfaces/mysql/mysql-sql.cl b/interfaces/mysql/mysql-sql.cl
index 878033c..65f2f6f 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.3 2002/03/24 04:01:26 kevin Exp $
+;;;; $Id: mysql-sql.cl,v 1.8 2002/03/25 14:13:41 kevin Exp $
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;; and Copyright (c) 1999-2001 by Pierre R. Mai
@@ -28,6 +28,9 @@
 ;;;;    for MYSQL structure. This will make the code more robust in
 ;;;;    the event that MySQL library changes the size of the mysql-mysql
 ;;;;    structure.
+;;;;
+;;;; Mar 2002
+;;;; Added field types
 
 (defpackage :clsql-mysql
     (:use :common-lisp :clsql-sys :mysql)
@@ -36,6 +39,78 @@
 
 (in-package :clsql-mysql)
 
+;;; Field conversion functions
+
+(defun canonicalize-field-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-test (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#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))
+  :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)))))
+
 (defmethod database-initialize-database-type ((database-type (eql :mysql)))
   t)
 
@@ -53,6 +128,7 @@
     (declare (ignore password))
     (concatenate 'string host "/" db "/" user)))
 
+
 (defmethod database-connect (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
@@ -95,59 +171,26 @@
   t)
 
 
-(defstruct mysql-result-set
-  (res-ptr (uffi:make-null-pointer 'mysql-mysql-res)
-	   :type mysql-mysql-res-ptr-def)
-  (full-set nil))
-
-(defmethod database-dump-result-set (result-set (database mysql-database))
-  (mysql-free-result (mysql-result-set-res-ptr result-set))
-  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)))
-    (declare (type mysql-mysql-res-ptr-def res-ptr)
-	     (type mysql-row-def row))
-    (unless (uffi:null-pointer-p row)
-      (loop for i from 0 below (mysql-num-fields res-ptr)
-	  for rest on list
-	  do
-	    (setf (car rest) 
-	      (uffi:convert-from-foreign-string (uffi:deref-array row 'mysql-row i))))
-      list)))
-
-
-(defmethod database-execute-command (sql-expression (database mysql-database))
-  (uffi:with-cstring (sql-native sql-expression)
-    (let ((mysql-ptr (database-mysql-ptr database)))
-      (declare (type mysql-mysql-ptr-def mysql-ptr))
-      (if (zerop (mysql-query mysql-ptr sql-native))
-	  t
-	(error 'clsql-sql-error
-	       :database database
-	       :expression sql-expression
-	       :errno (mysql-errno mysql-ptr)
-	       :error (mysql-error-string mysql-ptr))))))
-
-
-
-(defmethod database-query (query-expression (database mysql-database))
+(defmethod database-query (query-expression (database mysql-database) 
+			   field-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
-		 (unwind-protect
-		     (loop for row = (mysql-fetch-row res-ptr)
-			 until (uffi:null-pointer-p row)
-			 collect
-			   (loop for i from 0 below (mysql-num-fields res-ptr)
-			       collect
-				 (uffi:convert-from-cstring
-				  (uffi:deref-array row 'mysql-row i))))
-		   (mysql-free-result res-ptr))
+		 (let ((num-fields (mysql-num-fields res-ptr)))
+		   (setq field-types (canonicalize-field-types 
+				      field-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))))
+		     (mysql-free-result res-ptr)))
 	       (error 'clsql-sql-error
 		      :database database
 		      :expression query-expression
@@ -159,10 +202,29 @@
 		:errno (mysql-errno mysql-ptr)
 		:error (mysql-error-string mysql-ptr))))))
 
+(defmethod database-execute-command (sql-expression (database mysql-database))
+  (uffi:with-cstring (sql-native sql-expression)
+    (let ((mysql-ptr (database-mysql-ptr database)))
+      (declare (type mysql-mysql-ptr-def mysql-ptr))
+      (if (zerop (mysql-query mysql-ptr sql-native))
+	  t
+	(error 'clsql-sql-error
+	       :database database
+	       :expression sql-expression
+	       :errno (mysql-errno mysql-ptr)
+	       :error (mysql-error-string mysql-ptr))))))
+
+(defstruct mysql-result-set
+  (res-ptr (uffi:make-null-pointer 'mysql-mysql-res)
+	   :type mysql-mysql-res-ptr-def)
+  (field-types nil)
+  (num-fields nil :type fixnum)
+  (full-set nil :type boolean))
+
 
 (defmethod database-query-result-set (query-expression 
 				      (database mysql-database)
-				      &optional full-set)
+				      &key full-set field-types)
   (uffi:with-cstring (query-native query-expression)
     (let ((mysql-ptr (database-mysql-ptr database)))
      (declare (type mysql-mysql-ptr-def mysql-ptr))
@@ -172,13 +234,22 @@
 			   (mysql-use-result mysql-ptr))))
 	    (declare (type mysql-mysql-res-ptr-def res-ptr))
 	    (if (not (uffi:null-pointer-p res-ptr))
-		(if full-set
-		    (values (make-mysql-result-set :res-ptr res-ptr :full-set t)
-			    (mysql-num-fields res-ptr)
-			    (mysql-num-rows res-ptr))
-		  (values (make-mysql-result-set :res-ptr res-ptr)
-			  (mysql-num-fields res-ptr)))
-	      (error 'clsql-sql-error
+		(let* ((num-fields (mysql-num-fields res-ptr))
+		       (result-set (make-mysql-result-set
+				    :res-ptr res-ptr
+				    :num-fields num-fields
+				    :full-set full-set
+				    :field-types
+				    (canonicalize-field-types 
+				     field-types num-fields
+				     res-ptr)))) 
+		  (if full-set
+		      (values result-set
+			      num-fields
+			      (mysql-num-rows res-ptr))
+		      (values result-set
+			      num-fields)))
+		(error 'clsql-sql-error
 		     :database database
 		     :expression query-expression
 		     :errno (mysql-errno mysql-ptr)
@@ -189,4 +260,27 @@
 	       :errno (mysql-errno mysql-ptr)
 	       :error (mysql-error-string mysql-ptr))))))
 
+(defmethod database-dump-result-set (result-set (database mysql-database))
+  (mysql-free-result (mysql-result-set-res-ptr result-set))
+  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)))
+    (declare (type mysql-mysql-res-ptr-def res-ptr)
+	     (type mysql-row-def row))
+    (unless (uffi:null-pointer-p row)
+      (loop for i from 0 below (mysql-result-set-num-fields result-set)
+	    for rest on list
+	    do
+	    (setf (car rest) 
+		  (convert-raw-field
+		   (uffi:deref-array row 'mysql-row i)
+		   field-types
+		   i)))
+      list)))
+