X-Git-Url: http://git.kpe.io/?p=clsql.git;a=blobdiff_plain;f=db-mysql%2Fmysql-sql.lisp;h=dd623033013e7952bf9140a3f0cabe99030ba94c;hp=0f24ffb08b4880a234ef2bccd90b7510665b60d2;hb=9bbed78051e80e6ab76ae47834136035602bbbf1;hpb=80d94a5396eeaca850bb643390b836d8bd0825b3 diff --git a/db-mysql/mysql-sql.lisp b/db-mysql/mysql-sql.lisp index 0f24ffb..dd62303 100644 --- a/db-mysql/mysql-sql.lisp +++ b/db-mysql/mysql-sql.lisp @@ -14,7 +14,7 @@ ;;;; ************************************************************************* (defpackage #:clsql-mysql - (:use #:common-lisp #:clsql-base-sys #:mysql #:clsql-uffi) + (:use #:common-lisp #:clsql-base #:mysql #:clsql-uffi) (:export #:mysql-database) (:documentation "This is the CLSQL interface to MySQL.")) @@ -392,7 +392,7 @@ (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" + (clsql-base:command-output "mysqladmin create -u~A -p~A -h~A ~A" user password (if host host "localhost") name) @@ -408,7 +408,7 @@ (defmethod database-destroy (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 -f -u~A -p~A -h~A ~A" + (clsql-base:command-output "mysqladmin drop -f -u~A -p~A -h~A ~A" user password (if host host "localhost") name) @@ -432,11 +432,11 @@ (let ((database (database-connect (list host "mysql" user password) type))) (unwind-protect (progn - (setf (slot-value database 'clsql-base-sys::state) :open) + (setf (slot-value database 'clsql-base::state) :open) (mapcar #'car (database-query "show databases" database :auto nil))) (progn (database-disconnect database) - (setf (slot-value database 'clsql-base-sys::state) :closed)))))) + (setf (slot-value database 'clsql-base::state) :closed)))))) ;;; Database capabilities @@ -458,6 +458,6 @@ (let ((tuple (car (database-query "SHOW VARIABLES LIKE 'HAVE_INNODB'" database :auto nil)))) (and tuple (string-equal "YES" (second tuple))))) -(when (clsql-base-sys:database-type-library-loaded :mysql) - (clsql-base-sys:initialize-database-type :database-type :mysql)) +(when (clsql-base:database-type-library-loaded :mysql) + (clsql-base:initialize-database-type :database-type :mysql))