r8936: merged classic-tests into tests

[clsql.git] / db-mysql / mysql-sql.lisp

diff --git a/db-mysql/mysql-sql.lisp b/db-mysql/mysql-sql.lisp
index 0f50e6c51d0d196e3416d342349cf99b5c2c9366..55918a935600d81aa07c738f2b026f948c04582f 100644 (file)
--- 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))
@@ -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))