X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=db-mysql%2Fmysql-sql.lisp;h=7cc6f50ba53d126b0a6af193125221fcb1e354b4;hb=a4097e19c5157e87b9991549bc44f3ef598aeb90;hp=ea66f3de3605dd16de43020a31ee458f5fa74f7a;hpb=a3e1cd20eec3903790c6e8f126345558904488f4;p=clsql.git

diff --git a/db-mysql/mysql-sql.lisp b/db-mysql/mysql-sql.lisp
index ea66f3d..7cc6f50 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))
@@ -407,6 +419,11 @@
 	  (database-disconnect database)
 	  (setf (slot-value database 'clsql-base-sys::state) :closed))))))
 
+;;; Database capabilities
+
+(defmethod db-use-column-on-drop-index? ((database mysql-database))
+  t)
 
 (when (clsql-base-sys:database-type-library-loaded :mysql)
   (clsql-base-sys:initialize-database-type :database-type :mysql))
+