r8879: fix sequence, fix sqlite uffi, fix schema table

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

diff --git a/db-mysql/mysql-sql.lisp b/db-mysql/mysql-sql.lisp
index 7a59077f3c1ae4618c77747ad8d2bae835be3563..75b81a8a88a0a19d9db90462b66b9fe2f0530cbd 100644 (file)
--- a/db-mysql/mysql-sql.lisp
+++ b/db-mysql/mysql-sql.lisp
@@ -225,7 +225,7 @@
   (full-set nil :type boolean))
 
 
-(defmethod database-query-result-set (query-expression 
+(defmethod database-query-result-set ((query-expression string)
                                      (database mysql-database)
                                      &key full-set types)
   (uffi:with-cstring (query-native query-expression)
@@ -294,8 +294,8 @@
 (defmethod database-list-tables ((database mysql-database) &key (owner nil))
   (declare (ignore owner))
   (remove-if #'(lambda (s)
-                 (and (>= (length s) 10)
-                      (string= (subseq s 0 10) "_usql_seq_")))
+                 (and (>= (length s) 11)
+                      (string= (subseq s 0 11) "_clsql_seq_")))
              (mapcar #'car (database-query "SHOW TABLES" database nil))))
     
 ;; MySQL 4.1 does not support views 
@@ -340,12 +340,12 @@
 ;;; Sequence functions
 
 (defun %sequence-name-to-table (sequence-name)
-  (concatenate 'string "_usql_seq_" (sql-escape sequence-name)))
+  (concatenate 'string "_clsql_seq_" (sql-escape sequence-name)))
 
 (defun %table-name-to-sequence-name (table-name)
-  (and (>= (length table-name) 10)
-       (string= (subseq table-name 0 10) "_usql_seq_")
-       (subseq table-name 10)))
+  (and (>= (length table-name) 11)
+       (string= (subseq table-name 0 11) "_clsql_seq_")
+       (subseq table-name 11)))
 
 (defmethod database-create-sequence (sequence-name
                                     (database mysql-database))
@@ -369,7 +369,7 @@
                                     &key (owner nil))
   (declare (ignore owner))
   (mapcar #'(lambda (s) (%table-name-to-sequence-name (car s)))
-          (database-query "SHOW TABLES LIKE '%usql_seq%'" 
+          (database-query "SHOW TABLES LIKE '%clsql_seq%'" 
                           database nil)))
 
 (defmethod database-set-sequence-position (sequence-name