X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=db-sqlite%2Fsqlite-sql.lisp;h=86749961bf614c01e5e87fd8c5da70f36c7f075f;hb=967266c94b00f91e5967b8330fe2b9134b0c0447;hp=5a902c97b024c0bb52eba959890a8076548701b2;hpb=db9892632e6eb7869aea7a94c16b523a82de1501;p=clsql.git

diff --git a/db-sqlite/sqlite-sql.lisp b/db-sqlite/sqlite-sql.lisp
index 5a902c9..8674996 100644
--- a/db-sqlite/sqlite-sql.lisp
+++ b/db-sqlite/sqlite-sql.lisp
@@ -188,7 +188,7 @@
   ;; Query is copied from .table command of sqlite comamnd line utility.
   (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
                             "SELECT name FROM sqlite_master WHERE type='table' UNION ALL SELECT name FROM sqlite_temp_master WHERE type='table' ORDER BY name"
                             database '()))))
@@ -210,13 +210,14 @@
 (defmethod database-list-table-indexes (table (database sqlite-database)
 					&key (owner nil))
   (declare (ignore owner))
-  (mapcar #'car 
-	  (database-query
-	   (format
-	    nil
-	    "SELECT name FROM sqlite_master WHERE type='index' AND tbl_name='~A' UNION ALL SELECT name FROM sqlite_temp_master WHERE type='index' AND tbl_name='~A' ORDER BY name"
-	    table table)
-	   database nil)))
+  (let ((*print-circle* nil))
+    (mapcar #'car 
+	    (database-query
+	     (format
+	      nil
+	      "SELECT name FROM sqlite_master WHERE type='index' AND tbl_name='~A' UNION ALL SELECT name FROM sqlite_temp_master WHERE type='index' AND tbl_name='~A' ORDER BY name"
+	      table table)
+	     database nil))))
 
 (declaim (inline sqlite-table-info))
 (defun sqlite-table-info (table database)
@@ -238,11 +239,11 @@
 	return (third field-info)))
 
 (defun %sequence-name-to-table-name (sequence-name)
-  (concatenate 'string "_clsql_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) 11)
-       (string= (subseq table-name 0 11) "_clsql_seq_")
+       (string= (subseq table-name 0 11) "_CLSQL_SEQ_")
        (subseq table-name 11)))
 
 
@@ -332,5 +333,10 @@
     (or (string-equal ":memory:" name)
 	(and (probe-file name) t))))
 
+;;; Database capabilities
+
+(defmethod db-type-has-boolean-where? ((db-type (eql :sqlite)))
+  nil)
+