projects
/
clsql.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r9335: Automated commit for Debian build of clsql upstream-version-2.10.16
[clsql.git]
/
db-sqlite
/
sqlite-api-clisp.lisp
diff --git
a/db-sqlite/sqlite-api-clisp.lisp
b/db-sqlite/sqlite-api-clisp.lisp
index a8c18ffe5b72f2b1fbee2ca659fe20369661d630..55fee0d4a84031c7413582c1087fcf03424a8f61 100644
(file)
--- a/
db-sqlite/sqlite-api-clisp.lisp
+++ b/
db-sqlite/sqlite-api-clisp.lisp
@@
-19,10
+19,10
@@
;; $Id$
;; $Id$
-(in-package :cl-user)
+(in-package
#
:cl-user)
-(defpackage :sqlite
- (:use
:common-lisp
:ffi)
+(defpackage
#
:sqlite
+ (:use
#:common-lisp #
:ffi)
(:export
;;; Conditions
#:sqlite-error
(:export
;;; Conditions
#:sqlite-error
@@
-32,7
+32,7
@@
;;; Core API.
#:sqlite-open
#:sqlite-close
;;; Core API.
#:sqlite-open
#:sqlite-close
-
+
;;; New API.
#:sqlite-compile
#:sqlite-step
;;; New API.
#:sqlite-compile
#:sqlite-step
@@
-50,9
+50,16
@@
;;; Macros.
#:with-open-sqlite-db
;;; Macros.
#:with-open-sqlite-db
- #:with-sqlite-vm))
+ #:with-sqlite-vm
+
+ ;;; Compatibility with clsql-sql-uffi.lisp
+ #:sqlite-aref
+ #:sqlite-free-table
+ #:make-null-vm
+ #:make-null-row
+ ))
-(in-package :sqlite)
+(in-package
#
:sqlite)
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;;;
@@
-343,9
+350,25
@@
(return-from nil)
(format t "~&column name = ~A, type = ~A~%"
(aref cols 1) (aref cols 2))))))))
(return-from nil)
(format t "~&column name = ~A, type = ~A~%"
(aref cols 1) (aref cols 2))))))))
+
+;;; Compatibility with sqlite-api-uffi.lisp
+
+(defun sqlite-aref (row i)
+ (aref row i))
+
+(defun sqlite-free-table (table)
+ (declare (ignore table))
+ )
+
+(defun make-null-vm ()
+ nil)
+
+(defun make-null-row ()
+ nil)
+
\f
;;;; Local Variables:
;;;; Mode: lisp
;;;; Syntax: ANSI-Common-Lisp
;;;; Package: sqlite
\f
;;;; Local Variables:
;;;; Mode: lisp
;;;; Syntax: ANSI-Common-Lisp
;;;; Package: sqlite
-;;;; End:
\ No newline at end of file
+;;;; End: