X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=db-mysql%2Fmysql-sql.lisp;h=074f24eb4a3043b1319c5ad84f3434dd6ec6a313;hb=6cee91ae8461fd78454da4781c008398ad06abe2;hp=873ab5eaca579369afc1f451e0da066c8ea8b8a1;hpb=cc92d162f24648d65ad872098353305a5baf91d7;p=clsql.git diff --git a/db-mysql/mysql-sql.lisp b/db-mysql/mysql-sql.lisp index 873ab5e..074f24e 100644 --- a/db-mysql/mysql-sql.lisp +++ b/db-mysql/mysql-sql.lisp @@ -261,7 +261,7 @@ (declare (ignore owner)) (remove-if #'(lambda (s) (and (>= (length s) 11) - (string= (subseq s 0 11) "_CLSQL_SEQ_"))) + (string-equal (subseq s 0 11) "_CLSQL_SEQ_"))) (mapcar #'car (database-query "SHOW TABLES" database nil)))) ;; MySQL 4.1 does not support views @@ -322,7 +322,7 @@ (defun %table-name-to-sequence-name (table-name) (and (>= (length table-name) 11) - (string= (subseq table-name 0 11) "_CLSQL_SEQ_") + (string-equal (subseq table-name 0 11) "_CLSQL_SEQ_") (subseq table-name 11))) (defmethod database-create-sequence (sequence-name @@ -346,9 +346,10 @@ (defmethod database-list-sequences ((database mysql-database) &key (owner nil)) (declare (ignore owner)) - (mapcar #'(lambda (s) (%table-name-to-sequence-name (car s))) - (database-query "SHOW TABLES LIKE '%clsql_seq%'" - database nil))) + (mapcan #'(lambda (s) + (let ((sn (%table-name-to-sequence-name (car s)))) + (and sn (list sn)))) + (database-query "SHOW TABLES" database nil))) (defmethod database-set-sequence-position (sequence-name (position integer) @@ -436,9 +437,8 @@ nil) (defmethod db-type-transaction-capable? ((db-type (eql :mysql)) database) - (let ((has-innodb (caar (database-query "SHOW VARIABLES LIKE 'HAVE_INNODB'" database :auto)))) - (and has-innodb (string-equal "YES" has-innodb)))) - + (let ((tuple (car (database-query "SHOW VARIABLES LIKE 'HAVE_INNODB'" database :auto)))) + (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))