r9189: implement result-types for sqlite

[clsql.git] / db-sqlite / sqlite-api-uffi.lisp

diff --git a/db-sqlite/sqlite-api-uffi.lisp b/db-sqlite/sqlite-api-uffi.lisp
index e9c6000037c88183b875ad8a8b7ee77a9978c6ba..939651522e882c093298297357ae658530031fd4 100644 (file)
--- a/db-sqlite/sqlite-api-uffi.lisp
+++ b/db-sqlite/sqlite-api-uffi.lisp
@@ -10,6 +10,7 @@
 ;;;; $Id$
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2003 by Aurelio Bignoli
+;;;; and Copyright (c) 2003-2004 by Kevin Rosenberg
 ;;;;
 ;;;; CLSQL users are granted the rights to distribute and use this software
 ;;;; as governed by the terms of the Lisp Lesser GNU Public License
@@ -52,6 +53,7 @@
           ;;; Types.
           #:sqlite-row
           #:sqlite-row-pointer
+          #:sqlite-row-pointer-type
           #:sqlite-vm-pointer))
 
 (in-package #:sqlite)
@@ -83,7 +85,8 @@
                         :code code
                         :message (if message
                                      message
-                                     (sqlite-error-string code)))))
+                                   (uffi:convert-from-cstring
+                                    (sqlite-error-string code))))))
     (unless (signal condition)
       (invoke-debugger condition))))
 
@@ -97,11 +100,15 @@
 (def-foreign-type string-pointer (* (* :char)))
 (def-foreign-type sqlite-row-pointer (* string-pointer))
 
+(defvar +null-errmsg-pointer+ (make-null-pointer 'errmsg))
+(defvar +null-string-pointer-pointer+ (make-null-pointer 'string-pointer))
+
+
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;;
 ;;; 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))
@@ -214,7 +221,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 +null-errmsg-pointer+)))
       (if (null-pointer-p db)
          (signal-sqlite-error SQLITE-ERROR
                               (format nil "unable to open ~A" db-name))
@@ -224,7 +231,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 +null-errmsg-pointer+)))
          (if (= result SQLITE-OK)
              vm
              (progn
@@ -246,8 +253,7 @@
          ((= result SQLITE-DONE)
           (free-foreign-object cols)
           (free-foreign-object col-names)
-          (values 0 (make-null-pointer 'string-pointer)
-                  (make-null-pointer 'string-pointer)))
+          (values 0 +null-string-pointer-pointer+ +null-string-pointer-pointer+))
          (t
           (free-foreign-object cols)
           (free-foreign-object col-names)
@@ -255,7 +261,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) +null-errmsg-pointer+)))
     (if (= result SQLITE-OK)
        (progn
          (free-foreign-object vm)
@@ -263,13 +269,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 +null-errmsg-pointer+)))
            (if (= result SQLITE-OK)
                (let ((cn (deref-pointer cols-n :int))
                      (rn (deref-pointer rows-n :int)))
@@ -289,7 +295,7 @@
 ;;;;
 (declaim (inline make-null-row))
 (defun make-null-row ()
-  (uffi:make-null-pointer 'string-pointer))
+  +null-string-pointer-pointer+)
 
 (declaim (inline make-null-vm))
 (defun make-null-vm ()
@@ -302,7 +308,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)