(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))
(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
(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))
: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))
(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))
projects / clsql.git / blobdiff