X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=db-mysql%2Fmysql-sql.lisp;h=55918a935600d81aa07c738f2b026f948c04582f;hb=fa32c4233b4a02ae631602dbb0a234ab10df8aaf;hp=b8e394c0eaea9e676ca5c1487a61a1cfb5ca84f5;hpb=e06ca99080d17083dcfcf3f148de4a8796773e78;p=clsql.git diff --git a/db-mysql/mysql-sql.lisp b/db-mysql/mysql-sql.lisp index b8e394c..55918a9 100644 --- a/db-mysql/mysql-sql.lisp +++ b/db-mysql/mysql-sql.lisp @@ -78,7 +78,9 @@ (check-connection-spec connection-spec database-type (host db user password)) (destructuring-bind (host db user password) connection-spec (declare (ignore password)) - (concatenate 'string host "/" db "/" user))) + (concatenate 'string + (if host host "localhost") + "/" db "/" user))) (defmethod database-connect (connection-spec (database-type (eql :mysql))) (check-connection-spec connection-spec database-type (host db user password)) @@ -124,7 +126,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 +137,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 +154,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 +171,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 +181,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 +193,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 @@ -225,9 +227,9 @@ (full-set nil :type boolean)) -(defmethod database-query-result-set (query-expression +(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 +247,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 +287,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 +296,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 +345,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)) @@ -391,28 +393,51 @@ (defmethod database-sequence-last (sequence-name (database mysql-database)) (declare (ignore sequence-name))) -;; Functions depending upon high-level CommonSQL classes/functions -#| -(defmethod database-output-sql ((expr clsql-sys::sql-typecast-exp) - (database mysql-database)) - (with-slots (clsql-sys::modifier clsql-sys::components) - expr - (if clsql-sys::modifier - (progn - (clsql-sys::output-sql clsql-sys::components database) - (write-char #\: sql-sys::*sql-stream*) - (write-char #\: sql-sys::*sql-stream*) - (write-string (symbol-name clsql-sys::modifier) - clsql-sys::*sql-stream*))))) - -(defmethod database-output-sql-as-type ((type (eql 'integer)) val - (database mysql-database)) - ;; typecast it so it uses the indexes - (when val - (make-instance 'clsql-sys::sql-typecast-exp - :modifier 'int8 - :components val))) -|# + + +(defmethod database-create (connection-spec (type (eql :mysql))) + (destructuring-bind (host name user password) connection-spec + (multiple-value-bind (output status) + (clsql-base-sys:command-output "mysqladmin create -u~A -p~A -h~A ~A" + user password + (if host host "localhost") + name) + (if (or (not (eql 0 status)) + (and (search "failed" output) (search "error" output))) + (error 'clsql-access-error + :connection-spec connection-spec + :database-type type + :error + (format nil "database-create failed: ~A" output)) + t)))) + +(defmethod database-destory (connection-spec (type (eql :mysql))) + (destructuring-bind (host name user password) connection-spec + (multiple-value-bind (output status) + (clsql-base-sys:command-output "mysqladmin drop -u~A -p~A -h~A ~A" + user password + (if host host "localhost") + name) + (if (or (not (eql 0 status)) + (and (search "failed" output) (search "error" output))) + (error 'clsql-access-error + :connection-spec connection-spec + :database-type type + :error + (format nil "database-destroy failed: ~A" output)) + t)))) + +(defmethod database-probe (connection-spec (type (eql :mysql))) + (destructuring-bind (host name user password) connection-spec + (let ((database (database-connect (list host "mysql" user password) type))) + (unwind-protect + (when + (find name (database-query "select db from db" + database :auto) + :key #'car :test #'string-equal) + t) + (database-disconnect database))))) + (when (clsql-base-sys:database-type-library-loaded :mysql) (clsql-base-sys:initialize-database-type :database-type :mysql))