X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=db-mysql%2Fmysql-sql.lisp;h=0f50e6c51d0d196e3416d342349cf99b5c2c9366;hb=5691bb90517d7c565a141d131da76c3de1f8d566;hp=c33456c6050fdc33f716b134aaef30c2ecef43ff;hpb=02c30e92614a52c892cc678933586f71c76fcf30;p=clsql.git

diff --git a/db-mysql/mysql-sql.lisp b/db-mysql/mysql-sql.lisp
index c33456c..0f50e6c 100644
--- a/db-mysql/mysql-sql.lisp
+++ b/db-mysql/mysql-sql.lisp
@@ -124,7 +124,7 @@
 
 
 (defmethod database-query (query-expression (database mysql-database) 
-			   types)
+			   result-types)
   (declare (optimize (speed 3) (safety 0) (debug 0) (space 0)))
   (let ((mysql-ptr (database-mysql-ptr database)))
     (uffi:with-cstring (query-native query-expression)
@@ -135,8 +135,8 @@
 		(unwind-protect
 		     (let ((num-fields (mysql-num-fields res-ptr)))
 		       (declare (fixnum num-fields))
-		       (setq types (canonicalize-types 
-				    types num-fields
+		       (setq result-types (canonicalize-types 
+				    result-types num-fields
 				    res-ptr))
 		       (loop for row = (mysql-fetch-row res-ptr)
                              for lengths = (mysql-fetch-lengths res-ptr)
@@ -152,7 +152,7 @@
 				  (uffi:deref-array row '(:array
 							  (* :unsigned-char))
 						    i)
-				  types i
+				  result-types i
                                   (uffi:deref-array lengths '(:array :unsigned-long)
 						    i))))))
 		  (mysql-free-result res-ptr))
@@ -169,7 +169,7 @@
 
 #+ignore
 (defmethod database-query (query-expression (database mysql-database) 
-			   types)
+			   result-types)
   (declare (optimize (speed 3) (safety 0) (debug 0) (space 0)))
   (let ((mysql-ptr (database-mysql-ptr database)))
     (uffi:with-cstring (query-native query-expression)
@@ -179,8 +179,8 @@
 		(unwind-protect
 		     (let ((num-fields (mysql-num-fields res-ptr)))
 		       (declare (fixnum num-fields))
-		       (setq types (canonicalize-types 
-				    types num-fields
+		       (setq result-types (canonicalize-types 
+				    result-types num-fields
 				    res-ptr))
 		       (loop for row = (mysql-fetch-row res-ptr)
 			     until (uffi:null-pointer-p row)
@@ -191,7 +191,7 @@
 				    (uffi:deref-array row '(:array
 							    (* :unsigned-char))
 						      i)
-				    types i))))
+				    result-types i))))
 		  (mysql-free-result res-ptr))
 		(error 'clsql-sql-error
 		       :database database
@@ -227,7 +227,7 @@
 
 (defmethod database-query-result-set ((query-expression string)
 				      (database mysql-database)
-				      &key full-set types)
+				      &key full-set result-types)
   (uffi:with-cstring (query-native query-expression)
     (let ((mysql-ptr (database-mysql-ptr database)))
      (declare (type mysql-mysql-ptr-def mysql-ptr))
@@ -245,7 +245,7 @@
 				    :full-set full-set
 				    :types
 				    (canonicalize-types 
-				     types num-fields
+				     result-types num-fields
 				     res-ptr)))) 
 		  (if full-set
 		      (values result-set
@@ -285,7 +285,7 @@
 		   (uffi:deref-array row '(:array (* :unsigned-char)) i)
 		   types
 		   i
-                   (uffi:deref-array lengths :unsigned-long i))))
+                   (uffi:deref-array lengths '(:array :unsigned-long) i))))
       list)))
 
 
@@ -294,8 +294,8 @@
 (defmethod database-list-tables ((database mysql-database) &key (owner nil))
   (declare (ignore owner))
   (remove-if #'(lambda (s)
-                 (and (>= (length s) 10)
-                      (string= (subseq s 0 10) "_clsql_seq_")))
+                 (and (>= (length s) 11)
+                      (string= (subseq s 0 11) "_clsql_seq_")))
              (mapcar #'car (database-query "SHOW TABLES" database nil))))
     
 ;; MySQL 4.1 does not support views 
@@ -343,9 +343,9 @@
   (concatenate 'string "_clsql_seq_" (sql-escape sequence-name)))
 
 (defun %table-name-to-sequence-name (table-name)
-  (and (>= (length table-name) 10)
-       (string= (subseq table-name 0 10) "_clsql_seq_")
-       (subseq table-name 10)))
+  (and (>= (length table-name) 11)
+       (string= (subseq table-name 0 11) "_clsql_seq_")
+       (subseq table-name 11)))
 
 (defmethod database-create-sequence (sequence-name
 				     (database mysql-database))