X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=db-sqlite%2Fsqlite-sql.lisp;h=9b7a8fceae594b08d404e4541d544fa0d1a23e6c;hb=cc92d162f24648d65ad872098353305a5baf91d7;hp=24b47271821c031d307368a72fae661585e43c55;hpb=e2c86e8c664d8b3ecfd215843a9a1fbf5fa83693;p=clsql.git diff --git a/db-sqlite/sqlite-sql.lisp b/db-sqlite/sqlite-sql.lisp index 24b4727..9b7a8fc 100644 --- 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 @@ -41,6 +41,8 @@ (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 @@ -73,12 +75,12 @@ :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 @@ -103,7 +105,7 @@ (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 @@ -112,8 +114,8 @@ (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)) @@ -124,7 +126,7 @@ (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) @@ -137,7 +139,6 @@ :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) @@ -157,7 +158,7 @@ (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) @@ -186,8 +187,8 @@ (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 '())))) @@ -206,6 +207,18 @@ "SELECT name FROM sqlite_master WHERE type='index' UNION ALL SELECT name FROM sqlite_temp_master WHERE type='index' ORDER BY name" database nil))) +(defmethod database-list-table-indexes (table (database sqlite-database) + &key (owner nil)) + (declare (ignore owner)) + (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) (database-query (format nil "PRAGMA table_info('~A')" table) @@ -226,29 +239,30 @@ 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)) (let ((table-name (%sequence-name-to-table-name sequence-name))) (database-execute-command (concatenate 'string "CREATE TABLE " table-name - " (id INTEGER PRIMARY KEY)") + " (last_value integer PRIMARY KEY, increment_by integer, min_value integer, is_called char(1))") database) (database-execute-command - (format nil "INSERT INTO ~A VALUES (-1)" table-name) + (concatenate 'string "INSERT INTO " table-name + " VALUES (1,1,1,'f')") database))) (defmethod database-drop-sequence (sequence-name (database sqlite-database)) (database-execute-command - (concatenate 'string "DROP TABLE " - (%sequence-name-to-table-name sequence-name)) + (concatenate 'string "DROP TABLE " (%sequence-name-to-table-name sequence-name)) database)) (defmethod database-list-sequences ((database sqlite-database) @@ -262,24 +276,67 @@ database '()))) (defmethod database-sequence-next (sequence-name (database sqlite-database)) - (let ((table-name (%sequence-name-to-table-name sequence-name))) - (database-execute-command - (format nil "UPDATE ~A SET id=(SELECT id FROM ~A)+1" - table-name table-name) - database) - (sqlite:sqlite-last-insert-rowid (sqlite-db database)) - (parse-integer - (caar (database-query (format nil "SELECT id from ~A" table-name) - database nil))))) + (without-interrupts + (let* ((table-name (%sequence-name-to-table-name sequence-name)) + (tuple + (car (database-query + (concatenate 'string "SELECT last_value,is_called FROM " + table-name) + database + :auto)))) + (cond + ((char-equal (schar (second tuple) 0) #\f) + (database-execute-command + (format nil "UPDATE ~A SET is_called='t'" table-name) + database) + (parse-integer (car tuple))) + (t + (let ((new-pos (1+ (parse-integer (car tuple))))) + (database-execute-command + (format nil "UPDATE ~A SET last_value=~D" table-name new-pos) + database) + new-pos)))))) + +(defmethod database-sequence-last (sequence-name (database sqlite-database)) + (without-interrupts + (parse-integer + (caar (database-query + (concatenate 'string "SELECT last_value FROM " + (%sequence-name-to-table-name sequence-name)) + database + :auto))))) (defmethod database-set-sequence-position (sequence-name (position integer) (database sqlite-database)) - (let ((table-name (%sequence-name-to-table-name sequence-name))) - (database-execute-command - (format nil "UPDATE ~A SET id=~A" table-name position) - database) - (sqlite:sqlite-last-insert-rowid (sqlite-db database)))) + (database-execute-command + (format nil "UPDATE ~A SET last_value=~A,is_called='t'" + (%sequence-name-to-table-name sequence-name) + position) + database) + position) + +(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)))) + +;;; Database capabilities + +(defmethod db-type-has-boolean-where? ((db-type (eql :sqlite))) + nil) + + -(defmethod database-sequence-last (sequence-name (database sqlite-database)) - (declare (ignore sequence-name database)))