r8873: better generic function

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

diff --git a/db-sqlite/sqlite-sql.lisp b/db-sqlite/sqlite-sql.lisp
index 24b47271821c031d307368a72fae661585e43c55..6fd3f0746a2ab663bc1c1f3eda881ffe91360279 100644 (file)
--- a/db-sqlite/sqlite-sql.lisp
+++ b/db-sqlite/sqlite-sql.lisp
@@ -7,7 +7,7 @@
 ;;;; Authors:  Aurelio Bignoli and Marcus Pearce
 ;;;; Created:  Aug 2003
 ;;;;
-;;;; $Id: sqlite-sql.lisp,v 1.5 2004/03/09 20:57:44 aurelio Exp $
+;;;; $Id$
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2003 by Aurelio Bignoli and
 ;;;; Marcus Pearce
@@ -112,7 +112,7 @@
   (n-col 0 :type fixnum))
 
 (defmethod database-query-result-set
-    (query-expression (database sqlite-database) &key full-set types)
+    ((query-expression string) (database sqlite-database) &key full-set types)
   (declare (ignore full-set types))
   (handler-case
       (let* ((vm (sqlite:sqlite-compile (sqlite-db database)
@@ -187,7 +187,7 @@
   ;; Query is copied from .table command of sqlite comamnd line utility.
   (remove-if #'(lambda (s)
                  (and (>= (length s) 10)
-                      (string= (subseq s 0 10) "_usql_seq_")))
+                      (string= (subseq s 0 10) "_clsql_seq_")))
              (mapcar #'car (database-query
                             "SELECT name FROM sqlite_master WHERE type='table' UNION ALL SELECT name FROM sqlite_temp_master WHERE type='table' ORDER BY name"
                             database '()))))
@@ -226,11 +226,11 @@
        return (third field-info)))
 
 (defun %sequence-name-to-table-name (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_")
+       (string= (subseq table-name 0 10) "_clsql_seq_")
        (subseq table-name 10)))
 
 (defmethod database-create-sequence (sequence-name