r9342: * db-sqlite/sqlite-uffi-api.lisp: Fix row-pointer type

        * *: Fix minor style warnings

diff --git a/ChangeLog b/ChangeLog
index 5e40734a91aecf3d6cf0a66bddda80ec2a76bb51..cd072d8a4c68b937b13eb55d69f8283f9d2c62e0 100644 (file)
--- 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 dabaad923b8bbd59886924ef7ceba182d97fffdf..a6cc666c0805358bb098137f79785b3e8f71ecee 100644 (file)
--- 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 39f064a59d791916b487f947e5f246c2fbf0f993..98667493ad0c94c581019abcfb65b9bc7f9f208a 100644 (file)
--- 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 2c61f253754b960a602094729af97edc1017f01f..c611fdff7c3394e3cb8058710471ecd400a3653a 100644 (file)
--- 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 f33a236769d83df592eedf0835d338858bd8d96a..a829d3894cbe4aa8e0e4767d247a05071a087a6e 100644 (file)
--- 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 5d47ce972af8d1fa811c443ec7cf058474aef55b..f4c87e09843314ec36897de2bb567b46eb8d2305 100644 (file)
--- 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 ae4da839514b7b8b32b0a32ee9f696308b41aa85..64f74739a0e33ca3bd6c586f3300bceab0544773 100644 (file)
--- 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 331db7d3ab795d3f974dc09f834ca180f452532b..63267022dc7ce8c7710b36edee0c395907ce35d8 100644 (file)
--- 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