From 805a41bcf71161ad719621108c6b7a499122bf15 Mon Sep 17 00:00:00 2001 From: "Kevin M. Rosenberg" Date: Fri, 9 Apr 2004 01:08:05 +0000 Subject: [PATCH] r8889: pre 2.4.0 --- ChangeLog | 2 +- db-sqlite/sqlite-api-uffi.lisp | 15 ++++++++------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index ab3d225..3e164b6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,7 @@ 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 diff --git a/db-sqlite/sqlite-api-uffi.lisp b/db-sqlite/sqlite-api-uffi.lisp index 61d1c7d..64cd43f 100644 --- a/db-sqlite/sqlite-api-uffi.lisp +++ b/db-sqlite/sqlite-api-uffi.lisp @@ -102,7 +102,7 @@ ;;; ;;; 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)) @@ -215,7 +215,7 @@ (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)) @@ -225,7 +225,7 @@ (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 @@ -256,7 +256,7 @@ (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) @@ -264,13 +264,13 @@ (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))) @@ -303,7 +303,8 @@ (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) -- 2.34.1