From f1ff5842ce264fbe47e8ef98e33e4aca3b71d863 Mon Sep 17 00:00:00 2001 From: "Kevin M. Rosenberg" Date: Thu, 13 May 2004 10:21:23 +0000 Subject: [PATCH] r9342: * db-sqlite/sqlite-uffi-api.lisp: Fix row-pointer type * *: Fix minor style warnings --- ChangeLog | 2 ++ db-postgresql-socket/postgresql-socket-api.lisp | 2 +- db-sqlite/sqlite-api-uffi.lisp | 10 +++++----- sql/basic-sql.lisp | 2 +- sql/classes.lisp | 1 + sql/metaclasses.lisp | 1 + sql/sql.lisp | 4 ++-- uffi/clsql-uffi.lisp | 2 +- 8 files changed, 14 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5e40734..cd072d8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 12 May 2004 Kevin Rosenberg (kevin@rosenberg.net) * sql/sql.lisp: Add FOR-EACH-ROW macro from clsql-classic/sql.lisp + * db-sqlite/sqlite-uffi-api.lisp: Fix row-pointer type + * *: Fix minor style warnings * clsql-classic: Remove system and subdirectory * clsql-base: Remove system and subdirectory and fold into clsql system diff --git a/db-postgresql-socket/postgresql-socket-api.lisp b/db-postgresql-socket/postgresql-socket-api.lisp index dabaad9..a6cc666 100644 --- a/db-postgresql-socket/postgresql-socket-api.lisp +++ b/db-postgresql-socket/postgresql-socket-api.lisp @@ -214,7 +214,7 @@ socket interface" ;;; Support for encrypted password transmission #-scl -(eval-when (compile eval load) +(eval-when (:compile-toplevel :load-toplevel :execute) (defvar *crypt-library-loaded* nil) (unless *crypt-library-loaded* diff --git a/db-sqlite/sqlite-api-uffi.lisp b/db-sqlite/sqlite-api-uffi.lisp index 39f064a..9866749 100644 --- a/db-sqlite/sqlite-api-uffi.lisp +++ b/db-sqlite/sqlite-api-uffi.lisp @@ -2,10 +2,10 @@ ;;;; ************************************************************************* ;;;; FILE IDENTIFICATION ;;;; -;;;; Name: sqlite-api-uffi.lisp -;;;; Purpose: Low-level SQLite interface using UFFI -;;;; Programmers: Aurelio Bignoli and Kevin Rosenberg -;;;; Date Started: Nov 2003 +;;;; Name: sqlite-api-uffi.lisp +;;;; Purpose: Low-level SQLite interface using UFFI +;;;; Authors: Aurelio Bignoli and Kevin Rosenberg +;;;; Created: Nov 2003 ;;;; ;;;; $Id$ ;;;; @@ -98,7 +98,7 @@ (def-foreign-type sqlite-db :pointer-void) (def-foreign-type sqlite-vm :pointer-void) (def-foreign-type string-pointer (* (* :unsigned-char))) -(def-foreign-type sqlite-row-pointer (* string-pointer)) +(def-foreign-type sqlite-row-pointer (* (* :unsigned-char))) (defvar +null-errmsg-pointer+ (make-null-pointer 'errmsg)) (defvar +null-string-pointer-pointer+ (make-null-pointer 'string-pointer)) diff --git a/sql/basic-sql.lisp b/sql/basic-sql.lisp index 2c61f25..c611fdf 100644 --- a/sql/basic-sql.lisp +++ b/sql/basic-sql.lisp @@ -16,7 +16,7 @@ ;;; Query -(defgeneric query (query-expression &key database result-types flatp) +(defgeneric query (query-expression &key database result-types flatp field-names) (:documentation "Execute the SQL query expression QUERY-EXPRESSION on the given DATABASE which defaults to *default-database*. RESULT-TYPES is a list diff --git a/sql/classes.lisp b/sql/classes.lisp index f33a236..a829d38 100644 --- a/sql/classes.lisp +++ b/sql/classes.lisp @@ -628,6 +628,7 @@ uninclusive, and the args from that keyword to the end." t) (defmethod output-sql ((query sql-object-query) database) + (declare (ignore database)) (with-slots (objects) query (when objects diff --git a/sql/metaclasses.lisp b/sql/metaclasses.lisp index 5d47ce9..f4c87e0 100644 --- a/sql/metaclasses.lisp +++ b/sql/metaclasses.lisp @@ -497,6 +497,7 @@ which does type checking before storing a value in a slot." ;; all other slots (t (let ((type-predicate #+openmcl (slot-value esd 'ccl::type-predicate))) + #-openmcl (declare (ignore type-predicate)) (change-class esd 'view-class-effective-slot-definition #+allegro :name #+allegro (slot-definition-name dsd)) diff --git a/sql/sql.lisp b/sql/sql.lisp index ae4da83..64f7473 100644 --- a/sql/sql.lisp +++ b/sql/sql.lisp @@ -33,8 +33,8 @@ :result-types result-types :field-names field-names)) (defmethod query ((expr sql-object-query) &key (database *default-database*) - (result-types :auto) (flatp nil)) - (declare (ignore result-types)) + (result-types :auto) (flatp nil) (field-names t)) + (declare (ignore result-types field-names)) (apply #'select (append (slot-value expr 'objects) (slot-value expr 'exp) (when (slot-value expr 'refresh) diff --git a/uffi/clsql-uffi.lisp b/uffi/clsql-uffi.lisp index 331db7d..6326702 100644 --- a/uffi/clsql-uffi.lisp +++ b/uffi/clsql-uffi.lisp @@ -28,7 +28,7 @@ (length-auto-list (length auto-list))) ((= i length-auto-list) (nreverse new-types)) - (declaim (fixnum length-types length-auto-list i)) + (declare (fixnum length-types length-auto-list i)) (if (>= i length-types) (push t new-types) ;; types is shorted than num-fields (push -- 2.34.1