(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)
(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)
(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))
#+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)
(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)
(uffi:deref-array row '(:array
(* :unsigned-char))
i)
- types i))))
+ result-types i))))
(mysql-free-result res-ptr))
(error 'clsql-sql-error
:database database
(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))
:full-set full-set
:types
(canonicalize-types
- types num-fields
+ result-types num-fields
res-ptr))))
(if full-set
(values result-set
(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)))
(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
(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))