X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=db-mysql%2Fmysql-sql.lisp;h=46544926debd64b7dd30c94214362f89ad1ab054;hb=3ec4277531c7c19b1cffade823d3e2e3f928ceb3;hp=d04f67138963f0fd3fdfe94e5e6f26d27b20ab9f;hpb=f68abc76e0e01f4633141a0c17a4d8f1976229b8;p=clsql.git

diff --git a/db-mysql/mysql-sql.lisp b/db-mysql/mysql-sql.lisp
index d04f671..4654492 100644
--- a/db-mysql/mysql-sql.lisp
+++ b/db-mysql/mysql-sql.lisp
@@ -274,10 +274,22 @@
                                   &key (owner nil))
   (let ((result '()))
     (dolist (table (database-list-tables database :owner owner) result)
-      (mapc #'(lambda (index) (push (nth 2 index) result))
-            (database-query 
-             (format nil "SHOW INDEX FROM ~A" (string-upcase table))
-             database nil)))))
+      (setq result
+	(append (database-list-table-indexes table database :owner owner)
+		result)))))
+
+(defmethod database-list-table-indexes (table (database mysql-database)
+					&key (owner nil))
+  (declare (ignore owner))
+  (do ((results nil)
+       (rows (database-query 
+	      (format nil "SHOW INDEX FROM ~A" (string-upcase table))
+	      database nil)
+	     (cdr rows)))
+      ((null rows) (nreverse results))
+    (let ((col (nth 2 (car rows))))
+      (unless (find col results :test #'string-equal)
+	(push col results)))))
   
 (defmethod database-list-attributes ((table string) (database mysql-database)
                                      &key (owner nil))
@@ -391,16 +403,27 @@
 	t))))
 
 (defmethod database-probe (connection-spec (type (eql :mysql)))
+  (when (find (second connection-spec) (database-list connection-spec type)
+	      :key #'car :test #'string-equal)
+    t))
+
+(defmethod database-list (connection-spec (type (eql :mysql)))
   (destructuring-bind (host name user password) connection-spec
+    (declare (ignore name))
     (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)))))
+	   (progn
+	     (setf (slot-value database 'clsql-base-sys::state) :open)
+	     (mapcar #'car (database-query "show databases" database :auto)))
+	(progn
+	  (database-disconnect database)
+	  (setf (slot-value database 'clsql-base-sys::state) :closed))))))
 
+;;; Database capabilities
+
+(defmethod db-use-column-on-drop-index? ((db-type (eql :mysql)))
+  t)
 
 (when (clsql-base-sys:database-type-library-loaded :mysql)
   (clsql-base-sys:initialize-database-type :database-type :mysql))
+