X-Git-Url: http://git.kpe.io/?p=clsql.git;a=blobdiff_plain;f=db-mysql%2Fmysql-sql.lisp;h=ce81abe7e9ae0049643ac6f2e9b6c69d4157e01c;hp=33d84e7ff3dbe9aa2ceccd229aa02edfb7f2b4bd;hb=06dfb268002579b31e8de6888c917f212fd1be1f;hpb=510b3d1d2d18c73ca222fce2b711f1b2f5025ba0 diff --git a/db-mysql/mysql-sql.lisp b/db-mysql/mysql-sql.lisp index 33d84e7..ce81abe 100644 --- a/db-mysql/mysql-sql.lisp +++ b/db-mysql/mysql-sql.lisp @@ -20,6 +20,12 @@ (in-package #:clsql-mysql) +;; if we have :sb-unicode, UFFI will treat :cstring as a UTF-8 string +(defun expression-length (query-expression) + (length #+sb-unicode (sb-ext:string-to-octets query-expression + :external-format :utf8) + #-sb-unicode query-expression)) + ;;; Field conversion functions (defun result-field-names (num-fields res-ptr) @@ -41,16 +47,25 @@ (dotimes (i num-fields) (declare (fixnum i)) (let* ((field (uffi:deref-array field-vec '(:array mysql-field) i)) - (type (uffi:get-slot-value field 'mysql-field 'type))) + (flags (uffi:get-slot-value field 'mysql-field 'mysql::flags)) + (unsigned (plusp (logand flags 32))) + (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#int24) + (if unsigned + :uint32 + :int32)) + (#.mysql-field-types#long + (if unsigned + :uint + :int)) + (#.mysql-field-types#longlong + (if unsigned + :uint64 + :int64)) ((#.mysql-field-types#double #.mysql-field-types#float #.mysql-field-types#decimal) @@ -86,16 +101,28 @@ :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 + (check-connection-spec connection-spec database-type + (host db user password &optional port)) + (destructuring-bind (host db user password &optional port) connection-spec (declare (ignore password)) (concatenate 'string - (if host host "localhost") + (etypecase host + (null "localhost") + (pathname (namestring host)) + (string host)) + (if port + (concatenate 'string + ":" + (etypecase port + (integer (write-to-string port)) + (string port))) + "") "/" 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 + (check-connection-spec connection-spec database-type + (host db user password &optional port)) + (destructuring-bind (host db user password &optional port) connection-spec (let ((mysql-ptr (mysql-init (uffi:make-null-pointer 'mysql-mysql))) (socket nil)) (if (uffi:null-pointer-p mysql-ptr) @@ -114,7 +141,12 @@ (if (uffi:null-pointer-p (mysql-real-connect mysql-ptr host-native user-native password-native - db-native 0 socket-native 0)) + db-native + (etypecase port + (null 0) + (integer port) + (string (parse-integer port))) + socket-native 0)) (progn (setq error-occurred t) (error 'sql-connection-error @@ -143,7 +175,7 @@ (let ((mysql-ptr (database-mysql-ptr database))) (uffi:with-cstring (query-native query-expression) (if (zerop (mysql-real-query mysql-ptr query-native - (length query-expression))) + (expression-length query-expression))) (let ((res-ptr (mysql-use-result mysql-ptr))) (if res-ptr (unwind-protect @@ -189,7 +221,7 @@ (let ((mysql-ptr (database-mysql-ptr database))) (declare (type mysql-mysql-ptr-def mysql-ptr)) (if (zerop (mysql-real-query mysql-ptr sql-native - (length sql-expression))) + (expression-length sql-expression))) t (error 'sql-database-data-error :database database @@ -212,7 +244,7 @@ (let ((mysql-ptr (database-mysql-ptr database))) (declare (type mysql-mysql-ptr-def mysql-ptr)) (if (zerop (mysql-real-query mysql-ptr query-native - (length query-expression))) + (expression-length query-expression))) (let ((res-ptr (if full-set (mysql-store-result mysql-ptr) (mysql-use-result mysql-ptr)))) @@ -387,14 +419,19 @@ (mysql:mysql-insert-id (clsql-mysql::database-mysql-ptr database)))) (defmethod database-sequence-last (sequence-name (database mysql-database)) - (declare (ignore sequence-name))) + (without-interrupts + (caar (database-query + (concatenate 'string "SELECT id from " + (%sequence-name-to-table sequence-name)) + database :auto nil)))) (defmethod database-create (connection-spec (type (eql :mysql))) - (destructuring-bind (host name user password) connection-spec + (destructuring-bind (host name user password &optional port) connection-spec (multiple-value-bind (output status) - (clsql-sys:command-output "mysqladmin create -u~A -p~A -h~A ~A" + (clsql-sys:command-output "mysqladmin create -u~A -p~A -h~A~@[ -P~A~] ~A" user password (if host host "localhost") + port name name) (if (or (not (eql 0 status)) (and (search "failed" output) (search "error" output))) @@ -405,12 +442,12 @@ t)))) (defmethod database-destroy (connection-spec (type (eql :mysql))) - (destructuring-bind (host name user password) connection-spec + (destructuring-bind (host name user password &optional port) connection-spec (multiple-value-bind (output status) - (clsql-sys:command-output "mysqladmin drop -f -u~A -p~A -h~A ~A" + (clsql-sys:command-output "mysqladmin drop -f -u~A -p~A -h~A~@[ -P~A~] ~A" user password (if host host "localhost") - name) + port name) (if (or (not (eql 0 status)) (and (search "failed" output) (search "error" output))) (error 'sql-database-error @@ -425,9 +462,9 @@ t)) (defmethod database-list (connection-spec (type (eql :mysql))) - (destructuring-bind (host name user password) connection-spec + (destructuring-bind (host name user password &optional port) connection-spec (declare (ignore name)) - (let ((database (database-connect (list host "mysql" user password) type))) + (let ((database (database-connect (list host "mysql" user password port) type))) (unwind-protect (progn (setf (slot-value database 'clsql-sys::state) :open) @@ -460,6 +497,7 @@ ((in type :bigint) mysql-field-types#longlong) ((in type :float :double :number) mysql-field-types#double) ((and (consp type) (in (car type) :char :string :varchar)) mysql-field-types#var-string) + ((or (eq type :blob) (and (consp type) (in (car type) :blob))) mysql-field-types#var-string) (t (error 'sql-user-error :message @@ -475,12 +513,14 @@ :message (mysql-error-string mysql-ptr))) (uffi:with-cstring (native-query sql-stmt) - (unless (zerop (mysql-stmt-prepare stmt native-query (length sql-stmt))) + (unless (zerop (mysql-stmt-prepare stmt native-query (expression-length sql-stmt))) + (mysql-stmt-close stmt) (error 'sql-database-error :error-id (mysql-errno mysql-ptr) :message (mysql-error-string mysql-ptr)))) (unless (= (mysql-stmt-param-count stmt) (length types)) + (mysql-stmt-close stmt) (error 'sql-database-error :message (format nil "Mysql param count (~D) does not match number of types (~D)" @@ -488,87 +528,98 @@ (let ((rs (mysql-stmt-result-metadata stmt))) (when (uffi:null-pointer-p rs) + (warn "mysql_stmt_result_metadata returned NULL") + #+nil + (mysql-stmt-close stmt) + #+nil (error 'sql-database-error - :message "NULL result metadata")) + :message "mysql_stmt_result_metadata returned NULL")) - (let* ((field-vec (mysql-fetch-fields rs)) - (num-fields (mysql-num-fields rs)) - (input-bind (uffi:allocate-foreign-object 'mysql-bind (length types))) - (output-bind (uffi:allocate-foreign-object 'mysql-bind num-fields)) - (length-ptr (uffi:allocate-foreign-object :unsigned-long num-fields)) - (is-null-ptr (uffi:allocate-foreign-object :byte num-fields)) - (mysql-types (mapcar 'clsql-type->mysql-type types))) + (let ((input-bind (uffi:allocate-foreign-object 'mysql-bind (length types))) + (mysql-types (mapcar 'clsql-type->mysql-type types)) + field-vec num-fields is-null-ptr output-bind length-ptr) + (print 'a) (dotimes (i (length types)) (let* ((binding (uffi:deref-array input-bind '(:array mysql-bind) i))) - (setf (uffi:get-slot-value binding 'mysql-bind 'buffer-type) - (nth i mysql-types)) - (setf (uffi:get-slot-value binding 'mysql-bind 'buffer-length) 0))) - - (dotimes (i num-fields) - (declare (fixnum i)) - (let* ((field (uffi:deref-array field-vec '(:array mysql-field) i)) - (type (uffi:get-slot-value field 'mysql-field 'type)) - (binding (uffi:deref-array output-bind '(:array mysql-bind) i))) - (setf (uffi:get-slot-value binding 'mysql-bind 'buffer-type) type) - - (setf (uffi:get-slot-value binding 'mysql-bind 'buffer-length) 0) - (setf (uffi:get-slot-value binding 'mysql-bind 'is-null) - (+ i (uffi:pointer-address is-null-ptr))) - (setf (uffi:get-slot-value binding 'mysql-bind 'length) - (+ (* i 8) (uffi:pointer-address length-ptr))) - - (case type - ((#.mysql-field-types#var-string #.mysql-field-types#string - #.mysql-field-types#tiny-blob #.mysql-field-types#blob - #.mysql-field-types#medium-blob #.mysql-field-types#long-blob) - (setf (uffi:get-slot-value binding 'mysql-bind 'buffer-length) 1024) - (setf (uffi:get-slot-value binding 'mysql-bind 'buffer) - (uffi:allocate-foreign-object :unsigned-char 1024))) - (#.mysql-field-types#tiny - (setf (uffi:get-slot-value binding 'mysql-bind 'buffer) - (uffi:allocate-foreign-object :byte))) - (#.mysql-field-types#short - (setf (uffi:get-slot-value binding 'mysql-bind 'buffer) - (uffi:allocate-foreign-object :short))) - (#.mysql-field-types#long - (setf (uffi:get-slot-value binding 'mysql-bind 'buffer) - ;; segfaults if supply :int on amd64 - (uffi:allocate-foreign-object :long))) - #+64bit - (#.mysql-field-types#longlong - (setf (uffi:get-slot-value binding 'mysql-bind 'buffer) - (uffi:allocate-foreign-object :long))) - (#.mysql-field-types#float - (setf (uffi:get-slot-value binding 'mysql-bind 'buffer) - (uffi:allocate-foreign-object :float))) - (#.mysql-field-types#double - (setf (uffi:get-slot-value binding 'mysql-bind 'buffer) - (uffi:allocate-foreign-object :double))) - ((#.mysql-field-types#time #.mysql-field-types#date - #.mysql-field-types#datetime #.mysql-field-types#timestamp) - (uffi:allocate-foreign-object 'mysql-time)) - (t - (error "mysql type ~D not supported." type))))) + (setf (uffi:get-slot-value binding 'mysql-bind 'mysql::buffer-type) + (nth i mysql-types)) + (setf (uffi:get-slot-value binding 'mysql-bind 'mysql::buffer-length) 0))) - (unless (zerop (mysql-stmt-bind-result stmt output-bind)) - (error 'sql-database-error - :error-id (mysql-stmt-errno stmt) - :message (uffi:convert-from-cstring - (mysql-stmt-error stmt)))) + (print 'b) + (unless (uffi:null-pointer-p rs) + (setq field-vec (mysql-fetch-fields rs) + num-fields (mysql-num-fields rs) + is-null-ptr (uffi:allocate-foreign-object :byte num-fields) + output-bind (uffi:allocate-foreign-object 'mysql-bind num-fields) + length-ptr (uffi:allocate-foreign-object :unsigned-long num-fields)) + (dotimes (i num-fields) + (declare (fixnum i)) + (let* ((field (uffi:deref-array field-vec '(:array mysql-field) i)) + (type (uffi:get-slot-value field 'mysql-field 'type)) + (binding (uffi:deref-array output-bind '(:array mysql-bind) i))) + (setf (uffi:get-slot-value binding 'mysql-bind 'mysql::buffer-type) type) + + (setf (uffi:get-slot-value binding 'mysql-bind 'mysql::buffer-length) 0) + #+need-to-allocate-foreign-object-for-this + (setf (uffi:get-slot-value binding 'mysql-bind 'mysql::is-null) + (+ i (uffi:pointer-address is-null-ptr))) + #+need-to-allocate-foreign-object-for-this + (setf (uffi:get-slot-value binding 'mysql-bind 'length) + (+ (* i 8) (uffi:pointer-address length-ptr))) + + (case type + ((#.mysql-field-types#var-string #.mysql-field-types#string + #.mysql-field-types#tiny-blob #.mysql-field-types#blob + #.mysql-field-types#medium-blob #.mysql-field-types#long-blob) + (setf (uffi:get-slot-value binding 'mysql-bind 'mysql::buffer-length) 1024) + (setf (uffi:get-slot-value binding 'mysql-bind 'mysql::buffer) + (uffi:allocate-foreign-object :unsigned-char 1024))) + (#.mysql-field-types#tiny + (setf (uffi:get-slot-value binding 'mysql-bind 'mysql::buffer) + (uffi:allocate-foreign-object :byte))) + (#.mysql-field-types#short + (setf (uffi:get-slot-value binding 'mysql-bind 'mysql::buffer) + (uffi:allocate-foreign-object :short))) + (#.mysql-field-types#long + (setf (uffi:get-slot-value binding 'mysql-bind 'mysql::buffer) + ;; segfaults if supply :int on amd64 + (uffi:allocate-foreign-object :long))) + #+64bit + (#.mysql-field-types#longlong + (setf (uffi:get-slot-value binding 'mysql-bind 'mysql::buffer) + (uffi:allocate-foreign-object :long))) + (#.mysql-field-types#float + (setf (uffi:get-slot-value binding 'mysql-bind 'mysql::buffer) + (uffi:allocate-foreign-object :float))) + (#.mysql-field-types#double + (setf (uffi:get-slot-value binding 'mysql-bind 'mysql::buffer) + (uffi:allocate-foreign-object :double))) + ((#.mysql-field-types#time #.mysql-field-types#date + #.mysql-field-types#datetime #.mysql-field-types#timestamp) + (uffi:allocate-foreign-object 'mysql-time)) + (t + (error "mysql type ~D not supported." type))))) + + (unless (zerop (mysql-stmt-bind-result stmt output-bind)) + (mysql-stmt-close stmt) + (error 'sql-database-error + :error-id (mysql-stmt-errno stmt) + :message (uffi:convert-from-cstring + (mysql-stmt-error stmt))))) (make-instance 'mysql-stmt - :database database - :stmt stmt - :num-fields num-fields - :input-bind input-bind - :output-bind output-bind - :result-set rs - :result-types result-types - :length-ptr length-ptr - :is-null-ptr is-null-ptr - :types mysql-types - :field-names field-names))))) + :database database + :stmt stmt + :num-fields num-fields + :input-bind input-bind + :output-bind output-bind + :result-set rs + :result-types result-types + :length-ptr length-ptr + :is-null-ptr is-null-ptr + :types mysql-types + :field-names field-names))))) #+mysql-client-v4.1 (defmethod database-bind-parameter ((stmt mysql-stmt) position value) @@ -579,12 +630,14 @@ (setf (uffi:get-slot-value binding 'mysql-bind 'length) 0) (cond ((null value) - (setf (uffi:deref-array (is-null-ptr stmt) '(:array :byte) (1- position)) 1)) + (when (is-null-ptr stmt) + (setf (uffi:deref-array (is-null-ptr stmt) '(:array :byte) (1- position)) 1))) (t - (setf (uffi:deref-array (is-null-ptr stmt) '(:array :byte) (1- position)) 0) + (when (is-null-ptr stmt) + (setf (uffi:deref-array (is-null-ptr stmt) '(:array :byte) (1- position)) 0)) (case type (#.mysql-field-types#long - (setf (uffi:get-slot-value binding 'mysql-bind 'buffer) value)) + (setf (uffi:get-slot-value binding 'mysql-bind 'mysql::buffer) value)) (t (warn "Unknown input bind type ~D." type)) ))))) @@ -592,11 +645,12 @@ #+mysql-client-v4.1 (defmethod database-run-prepared ((stmt mysql-stmt)) (print 'a1) - (unless (zerop (mysql-stmt-bind-param (stmt stmt) (input-bind stmt))) - (error 'sql-database-error - :error-id (mysql-stmt-errno (stmt stmt)) - :message (uffi:convert-from-cstring - (mysql-stmt-error (stmt stmt))))) + (when (input-bind stmt) + (unless (zerop (mysql-stmt-bind-param (stmt stmt) (input-bind stmt))) + (error 'sql-database-error + :error-id (mysql-stmt-errno (stmt stmt)) + :message (uffi:convert-from-cstring + (mysql-stmt-error (stmt stmt)))))) (print 'a2) (unless (zerop (mysql-stmt-execute (stmt stmt))) (error 'sql-database-error @@ -625,8 +679,8 @@ (uffi:deref-array (is-null-ptr stmt) '(:array :byte) i)))))) (unless is-null (let* ((bind (uffi:deref-array (output-bind stmt) '(:array mysql-bind) i)) - (type (uffi:get-slot-value bind 'mysql-bind 'buffer-type)) - (buffer (uffi:get-slot-value bind 'mysql-bind 'buffer))) + (type (uffi:get-slot-value bind 'mysql-bind 'mysql::buffer-type)) + (buffer (uffi:get-slot-value bind 'mysql-bind 'mysql::buffer))) (case type ((#.mysql-field-types#var-string #.mysql-field-types#string #.mysql-field-types#tiny-blob #.mysql-field-types#blob @@ -653,7 +707,7 @@ (day (uffi:get-slot-value buffer 'mysql-time 'mysql::day)) (hour (uffi:get-slot-value buffer 'mysql-time 'mysql::hour)) (minute (uffi:get-slot-value buffer 'mysql-time 'mysql::minute)) - (second (uffi:get-slot-value buffer 'mysql-time 'mysql::second))) + (second (uffi:get-slot-value buffer 'mysql-time 'mysql::second))) (db-timestring (make-time :year year :month month :day day :hour hour :minute minute :second second))))