X-Git-Url: http://git.kpe.io/?p=clsql.git;a=blobdiff_plain;f=interfaces%2Fmysql%2Fmysql-sql.cl;h=576438e04f835b0518aeca0f02ab71cab035b112;hp=d8b674c8e0aac0d3acb23f01c7d9a875e94f38b7;hb=21a11d58a1d421db0c53a063178dd2bc02663a15;hpb=9d53eaaae02609b0d7076be0853ff0f0ab06b644

diff --git a/interfaces/mysql/mysql-sql.cl b/interfaces/mysql/mysql-sql.cl
index d8b674c..576438e 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.9 2002/03/25 14:26:23 kevin Exp $
+;;;; $Id: mysql-sql.cl,v 1.10 2002/03/25 23:48:46 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,7 +41,7 @@
 
 ;;; Field conversion functions
 
-(defun canonicalize-field-types (types num-fields res-ptr)
+(defun canonicalize-types (types num-fields res-ptr)
   (cond
    ((if (listp types)
 	(let ((length-types (length types))
@@ -171,15 +171,15 @@
 
 
 (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)
@@ -216,14 +216,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))
@@ -238,9 +238,9 @@
 				    :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
@@ -268,7 +268,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)
@@ -278,7 +278,7 @@
 	    (setf (car rest) 
 		  (convert-raw-field
 		   (uffi:deref-array row 'mysql-row i)
-		   field-types
+		   types
 		   i)))
       list)))