X-Git-Url: http://git.kpe.io/?p=clsql.git;a=blobdiff_plain;f=db-sqlite%2Fsqlite-sql.lisp;h=17e8ff81dbf70dfac2a521060abcccf224f4b1e1;hp=63edf07532ee8fae3e0e97b3aa5a3a0d6b244c83;hb=e622ee6f4bf2b9fe81af59d566e651c983a4833b;hpb=56ccd9c18c38262936b8988264edfb927e83eb49 diff --git a/db-sqlite/sqlite-sql.lisp b/db-sqlite/sqlite-sql.lisp index 63edf07..17e8ff8 100644 --- a/db-sqlite/sqlite-sql.lisp +++ b/db-sqlite/sqlite-sql.lisp @@ -4,13 +4,13 @@ ;;;; ;;;; Name: sqlite-sql.lisp ;;;; Purpose: High-level SQLite interface -;;;; Authors: Aurelio Bignoli and Marcus Pearce +;;;; Authors: Aurelio Bignoli, Kevin Rosenberg, Marcus Pearce ;;;; Created: Aug 2003 ;;;; ;;;; $Id$ ;;;; ;;;; This file, part of CLSQL, is Copyright (c) 2003 by Aurelio Bignoli and -;;;; Marcus Pearce +;;;; Copyright (c) 2003-2004 by Kevin Rosenberg and Marcus Pearce. ;;;; ;;;; CLSQL users are granted the rights to distribute and use this software ;;;; as governed by the terms of the Lisp Lesser GNU Public License @@ -41,13 +41,15 @@ (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 'sql-connection-error :database-type database-type :connection-spec connection-spec - :errno (sqlite:sqlite-error-code err) - :error (sqlite:sqlite-error-message err))))) + :error-id (sqlite:sqlite-error-code err) + :message (sqlite:sqlite-error-message err))))) (defmethod database-disconnect ((database sqlite-database)) (sqlite:sqlite-close (sqlite-db database)) @@ -58,94 +60,116 @@ (handler-case (multiple-value-bind (data row-n col-n) (sqlite:sqlite-get-table (sqlite-db database) sql-expression) - #+clisp (declare (ignore data)) - #-clisp (sqlite:sqlite-free-table data) + (sqlite:sqlite-free-table data) (unless (= row-n 0) - (error 'clsql-simple-warning + (error 'sql-warning :format-control "Result set not empty: ~@(~A~) row~:P, ~@(~A~) column~:P " :format-arguments (list row-n col-n)))) (sqlite:sqlite-error (err) - (error 'clsql-sql-error + (error 'sql-database-data-error :database database :expression sql-expression - :errno (sqlite:sqlite-error-code err) - :error (sqlite:sqlite-error-message err)))) + :error-id (sqlite:sqlite-error-code err) + :message (sqlite:sqlite-error-message err)))) t) -(defmethod database-query (query-expression (database sqlite-database) types) - (declare (ignore 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)) - (if (= row-n 0) - nil - (prog1 - ;; The first col-n elements are column names. - (loop for i from col-n below (* (1+ row-n) col-n) by col-n - collect (loop for j from 0 below col-n - collect - (#+clisp aref - #-clisp sqlite:sqlite-aref - data (+ i j)))) - #-clisp (sqlite:sqlite-free-table data)) - )) - (sqlite:sqlite-error (err) - (error 'clsql-sql-error - :database database - :expression query-expression - :errno (sqlite:sqlite-error-code err) - :error (sqlite:sqlite-error-message err))))) - -#-clisp (defstruct sqlite-result-set (vm (sqlite:make-null-vm) - :type sqlite:sqlite-vm-pointer) + #-clisp :type + #-clisp sqlite:sqlite-vm-pointer) (first-row (sqlite:make-null-row) - :type sqlite:sqlite-row-pointer) - (n-col 0 :type fixnum)) -#+clisp -(defstruct sqlite-result-set - (vm nil) - (first-row nil) + #-clisp :type + #-clisp sqlite:sqlite-row-pointer-type) + (col-names (sqlite:make-null-row) + #-clisp :type + #-clisp sqlite:sqlite-row-pointer-type) + (result-types nil) (n-col 0 :type fixnum)) -(defmethod database-query-result-set - ((query-expression string) (database sqlite-database) &key full-set types) - (declare (ignore full-set types)) +(defmethod database-query (query-expression (database sqlite-database) result-types field-names) + (declare (optimize (speed 3) (safety 0) (debug 0) (space 0))) (handler-case - (let* ((vm (sqlite:sqlite-compile (sqlite-db database) - query-expression)) - (result-set (make-sqlite-result-set :vm vm))) - #-clisp (declare (type sqlite:sqlite-vm-pointer vm)) + (multiple-value-bind (result-set n-col) + (database-query-result-set query-expression database + :result-types result-types + :full-set nil) + (do* ((rows nil) + (col-names (when field-names + (loop for j from 0 below n-col + collect (sqlite:sqlite-aref (sqlite-result-set-col-names result-set) j)))) + (new-row (make-list n-col) (make-list n-col)) + (row-ok (database-store-next-row result-set database new-row) + (database-store-next-row result-set database new-row))) + ((not row-ok) + (values (nreverse rows) col-names)) + (push new-row rows))) + (sqlite:sqlite-error (err) + (error 'sql-database-data-error + :database database + :expression query-expression + :error-id (sqlite:sqlite-error-code err) + :message (sqlite:sqlite-error-message err))))) - ;;; To obtain column number we have to read the first row. +(defmethod database-query-result-set ((query-expression string) + (database sqlite-database) + &key result-types full-set) + (handler-case + (let ((vm (sqlite:sqlite-compile (sqlite-db database) + query-expression))) + ;;; To obtain column number/datatypes we have to read the first row. (multiple-value-bind (n-col cols col-names) (sqlite:sqlite-step vm) - (declare (ignore col-names) - #-clisp (type sqlite:sqlite-row-pointer cols) - ) - (setf (sqlite-result-set-first-row result-set) cols - (sqlite-result-set-n-col result-set) n-col) - (values result-set n-col nil))) + (let ((result-set (make-sqlite-result-set + :vm vm + :first-row cols + :n-col n-col + :col-names col-names + :result-types + (canonicalize-result-types + result-types + n-col + col-names)))) + (if full-set + (values result-set n-col nil) + (values result-set n-col))))) (sqlite:sqlite-error (err) - (error 'clsql-sql-error + (error 'sql-database-error :database database :expression query-expression - :errno (sqlite:sqlite-error-code err) - :error (sqlite:sqlite-error-message err))))) + :error-id (sqlite:sqlite-error-code err) + :message (sqlite:sqlite-error-message err))))) + +(defun canonicalize-result-types (result-types n-col col-names) + (when result-types + (let ((raw-types (if (eq :auto result-types) + (loop for j from n-col below (* 2 n-col) + collect (ensure-keyword (sqlite:sqlite-aref col-names j))) + result-types))) + (loop for type in raw-types + collect + (case type + ((:int :integer :tinyint :long :bigint) + :int32) + ((:float :double) + :double) + ((:numeric) + :number) + (otherwise + :string)))))) (defmethod database-dump-result-set (result-set (database sqlite-database)) (handler-case (sqlite:sqlite-finalize (sqlite-result-set-vm result-set)) (sqlite:sqlite-error (err) - (error 'clsql-simple-error - :format-control "Error finalizing SQLite VM: ~A" - :format-arguments (list (sqlite:sqlite-error-message err)))))) + (error 'sql-database-error + :message + (format nil "Error finalizing SQLite VM: ~A" + (sqlite:sqlite-error-message err)))))) (defmethod database-store-next-row (result-set (database sqlite-database) list) - (let ((n-col (sqlite-result-set-n-col result-set))) + (let ((n-col (sqlite-result-set-n-col result-set)) + (result-types (sqlite-result-set-result-types result-set))) (if (= n-col 0) ;; empty result set nil @@ -156,59 +180,93 @@ (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) (setf row new-row))) (sqlite:sqlite-error (err) - (error 'clsql-simple-error - :format-control "Error in sqlite-step: ~A" - :format-arguments - (list (sqlite:sqlite-error-message err))))) + (error 'sql-database-error + :message + (format nil "Error in sqlite-step: ~A" + (sqlite:sqlite-error-message err))))) - ;; Use the row previously read by database-query-result-set. + ;; Use the row previously read by database-query-result-set. (setf (sqlite-result-set-first-row result-set) (sqlite:make-null-row))) (loop for i = 0 then (1+ i) for rest on list do (setf (car rest) - (#+clisp aref - #-clisp sqlite:sqlite-aref - row i))) - #-clisp (sqlite:sqlite-free-row row) + #-clisp + (clsql-uffi:convert-raw-field + (uffi:deref-array + (uffi:deref-pointer row 'sqlite:sqlite-row-pointer) '(:array (* :unsigned-char)) i) + result-types + i) + #+clisp + (let ((type (if result-types + (nth i result-types) + :string)) + (val (sqlite:sqlite-aref row i))) + (case type + (:string + val) + (:integer + (when val (parse-integer val))) + (:number + (read-from-string val)) + (:double + (when val + (coerce + (read-from-string val) + 'double-float))))))) + (sqlite:sqlite-free-row row) t)))) ;;; Object listing -(defmethod database-list-tables ((database sqlite-database) &key owner) +(defmethod database-list-tables-and-sequences ((database sqlite-database) &key owner) (declare (ignore owner)) ;; Query is copied from .table command of sqlite comamnd line utility. + (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 nil nil))) + +(defmethod database-list-tables ((database sqlite-database) &key owner) (remove-if #'(lambda (s) (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 '())))) + (string-equal (subseq s 0 11) "_CLSQL_SEQ_"))) + (database-list-tables-and-sequences database :owner owner))) (defmethod database-list-views ((database sqlite-database) &key (owner nil)) (declare (ignore owner)) (mapcar #'car (database-query "SELECT name FROM sqlite_master WHERE type='view' UNION ALL SELECT name FROM sqlite_temp_master WHERE type='view' ORDER BY name" - database nil))) + database nil nil))) (defmethod database-list-indexes ((database sqlite-database) &key (owner nil)) (declare (ignore owner)) (mapcar #'car (database-query "SELECT name FROM sqlite_master WHERE type='index' UNION ALL SELECT name FROM sqlite_temp_master WHERE type='index' ORDER BY name" - database nil))) + database nil 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 nil)))) (declaim (inline sqlite-table-info)) (defun sqlite-table-info (table database) (database-query (format nil "PRAGMA table_info('~A')" table) - database '())) + database nil nil)) (defmethod database-list-attributes (table (database sqlite-database) &key (owner nil)) @@ -221,64 +279,44 @@ &key (owner nil)) (declare (ignore owner)) (loop for field-info in (sqlite-table-info table database) - when (string= attribute (second field-info)) - return (third field-info))) - -(defun %sequence-name-to-table-name (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_") - (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)") - database) - (database-execute-command - (format nil "INSERT INTO ~A VALUES (-1)" table-name) - database))) - -(defmethod database-drop-sequence (sequence-name - (database sqlite-database)) - (database-execute-command - (concatenate 'string "DROP TABLE " - (%sequence-name-to-table-name sequence-name)) - database)) - -(defmethod database-list-sequences ((database sqlite-database) - &key (owner nil)) - (declare (ignore owner)) - (mapcan #'(lambda (s) - (let ((sn (%table-name-to-sequence-name (car s)))) - (and sn (list sn)))) - (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 '()))) - -(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))))) - -(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)))) - -(defmethod database-sequence-last (sequence-name (database sqlite-database)) - (declare (ignore sequence-name))) + when (string= attribute (second field-info)) + return + (let* ((raw-type (third field-info)) + (start-length (position #\( raw-type)) + (type (if start-length + (subseq raw-type 0 start-length) + raw-type)) + (length (if start-length + (parse-integer (subseq raw-type (1+ start-length)) + :junk-allowed t) + nil))) + (values (when type (ensure-keyword type)) + length + nil + (if (string-equal (fourth field-info) "0") + 1 0))))) + +(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) + + +