08 Apr 2004 Kevin Rosenberg (kevin@rosenberg.net)
* Version 2.4.0 released: All tests for clsql-classic now finish
correctly on Allegro, Lispworks, CMUCL, SBCL, OpenMCL for
- mysql and postgresql backends. postgresql-socket backend
+ mysql, postgresql, and sqlite backends. postgresql-socket backend
passes all tests for Allegro, Lispworks, CMUCL, and SBCL.
* db-mysql/mysql-sql.lisp: Fix array dereferencing
* classic-tests/tests.lisp: Fix package name of
;;;
;;; Lisp types used in declarations.
;;;;
-(def-type sqlite-db sqlite-db)
+(def-type sqlite-db-type sqlite-db)
(def-type sqlite-row string-pointer)
(def-type sqlite-row-pointer-type (* string-pointer))
(def-type sqlite-vm-pointer (* sqlite-vm))
(defun sqlite-open (db-name &optional (mode 0))
(with-cstring (db-name-native db-name)
- (let ((db (%open db-name-native mode nil)))
+ (let ((db (%open db-name-native mode 0)))
(if (null-pointer-p db)
(signal-sqlite-error SQLITE-ERROR
(format nil "unable to open ~A" db-name))
(with-cstring (sql-native sql)
(let ((vm (allocate-foreign-object 'sqlite-vm)))
(with-foreign-object (sql-tail '(* :char))
- (let ((result (%compile db sql-native sql-tail vm nil)))
+ (let ((result (%compile db sql-native sql-tail vm 0)))
(if (= result SQLITE-OK)
vm
(progn
(defun sqlite-finalize (vm)
(declare (type sqlite-vm-pointer vm))
- (let ((result (%finalize (deref-pointer vm 'sqlite-vm) nil)))
+ (let ((result (%finalize (deref-pointer vm 'sqlite-vm) 0)))
(if (= result SQLITE-OK)
(progn
(free-foreign-object vm)
(signal-sqlite-error result))))
(defun sqlite-get-table (db sql)
- (declare (type sqlite-db db))
+ (declare (type sqlite-db-type db))
(with-cstring (sql-native sql)
(let ((rows (allocate-foreign-object '(* (* :char)))))
(declare (type sqlite-row-pointer-type rows))
(with-foreign-object (rows-n :int)
(with-foreign-object (cols-n :int)
- (let ((result (%get-table db sql-native rows rows-n cols-n nil)))
+ (let ((result (%get-table db sql-native rows rows-n cols-n 0)))
(if (= result SQLITE-OK)
(let ((cn (deref-pointer cols-n :int))
(rn (deref-pointer rows-n :int)))
(declaim (inline sqlite-aref))
(defun sqlite-aref (a n)
(declare (type sqlite-row-pointer-type a))
- (convert-from-foreign-string (deref-array (deref-pointer a 'sqlite-row-pointer) '(:array :char) n)))
+ (convert-from-foreign-string
+ (deref-array (deref-pointer a 'sqlite-row-pointer) '(:array (* :char)) n)))
(declaim (inline sqlite-free-row))
(defun sqlite-free-row (row)