;;;; 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
(handler-case
(make-instance 'sqlite-database
:name (database-name-from-spec connection-spec :sqlite)
+ :database-type :sqlite
+ :connection-spec connection-spec
:sqlite-db (sqlite:sqlite-open (first connection-spec)))
(sqlite:sqlite-error (err)
(error 'clsql-connect-error
:error (sqlite:sqlite-error-message err))))
t)
-(defmethod database-query (query-expression (database sqlite-database) types)
- (declare (ignore types)) ; SQLite is typeless!
+(defmethod database-query (query-expression (database sqlite-database) result-types)
+ (declare (ignore result-types)) ; SQLite is typeless!
(handler-case
(multiple-value-bind (data row-n col-n)
(sqlite:sqlite-get-table (sqlite-db database) query-expression)
- #-clisp (declare (type sqlite:sqlite-row-pointer data))
+ #-clisp (declare (type sqlite:sqlite-row-pointer-type data))
(if (= row-n 0)
nil
(prog1
(vm (sqlite:make-null-vm)
:type sqlite:sqlite-vm-pointer)
(first-row (sqlite:make-null-row)
- :type sqlite:sqlite-row-pointer)
+ :type sqlite:sqlite-row-pointer-type)
(n-col 0 :type fixnum))
#+clisp
(defstruct sqlite-result-set
(n-col 0 :type fixnum))
(defmethod database-query-result-set
- (query-expression (database sqlite-database) &key full-set types)
- (declare (ignore full-set types))
+ ((query-expression string) (database sqlite-database) &key full-set result-types)
+ (declare (ignore full-set result-types))
(handler-case
(let* ((vm (sqlite:sqlite-compile (sqlite-db database)
query-expression))
(multiple-value-bind (n-col cols col-names)
(sqlite:sqlite-step vm)
(declare (ignore col-names)
- #-clisp (type sqlite:sqlite-row-pointer cols)
+ #-clisp (type sqlite:sqlite-row-pointer-type cols)
)
(setf (sqlite-result-set-first-row result-set) cols
(sqlite-result-set-n-col result-set) n-col)
:error (sqlite:sqlite-error-message err)))))
(defmethod database-dump-result-set (result-set (database sqlite-database))
- (declare (ignore database))
(handler-case
(sqlite:sqlite-finalize (sqlite-result-set-vm result-set))
(sqlite:sqlite-error (err)
(multiple-value-bind (n new-row col-names)
(sqlite:sqlite-step (sqlite-result-set-vm result-set))
(declare (ignore n col-names)
- #-clisp (type sqlite:sqlite-row-pointer new-row)
+ #-clisp (type sqlite:sqlite-row-pointer-type new-row)
)
(if (sqlite:null-row-p new-row)
(return-from database-store-next-row nil)
(declare (ignore owner))
;; 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_")))
+ (and (>= (length s) 11)
+ (string= (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 '()))))
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_")
- (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 sqlite-database))
(sqlite:sqlite-last-insert-rowid (sqlite-db database))))
(defmethod database-sequence-last (sequence-name (database sqlite-database))
- (declare (ignore sequence-name database)))
+ (declare (ignore sequence-name)))
+
+(defmethod database-create (connection-spec (type (eql :sqlite)))
+ (declare (ignore connection-spec))
+ ;; databases are created automatically by SQLite
+ t)
+
+(defmethod database-destroy (connection-spec (type (eql :sqlite)))
+ (destructuring-bind (name) connection-spec
+ (if (probe-file name)
+ (delete-file name)
+ nil)))
+
+(defmethod database-probe (connection-spec (type (eql :sqlite)))
+ (destructuring-bind (name) connection-spec
+ ;; TODO: Add a test that this file is a real sqlite database
+ (or (string-equal ":memory:" name)
+ (and (probe-file name) t))))
+
+
+