r9190: few bug fixes

diff --git a/ChangeLog b/ChangeLog
index f7bb35767e63e02e8842db79c1d4431bdfcb5f0b..7b57d6a2f4c2d01a6d194f82a85e157004a46239 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+1 May 2004 Kevin Rosenberg (kevin@rosenberg.net)
+       * Version 2.10.4
+       * sql/tables.lisp: Fix typo in CACHE-TABLE-QUERIES
+       [Marcus Pearce]
+       * db-postgresql/postgresql-sql.lisp: Fix foreign-string vs. cstring
+       bug on SBCL in result-field-names function as reported by Marcus Pearce
+       * db-sqlite/sqlite-sql.lisp: Fix  in database-store-next-row
+       manifest in SBCL testing
+       
 1 May 2004 Kevin Rosenberg (kevin@rosenberg.net)
        * Version 2.10.3
        * sql/database.lisp: Conform more to CommonSQL output

diff --git a/db-postgresql/postgresql-sql.lisp b/db-postgresql/postgresql-sql.lisp
index 156e11e08c26abebb0c8863321b041bb9abff2d9..47df535d193748a626b14344c7157a18cefc4f6a 100644 (file)
--- a/db-postgresql/postgresql-sql.lisp
+++ b/db-postgresql/postgresql-sql.lisp
@@ -192,7 +192,7 @@
   (let ((names '()))
     (dotimes (i num-fields (nreverse names))
       (declare (fixnum i))
-      (push (uffi:convert-from-foreign-string (PQfname result i)) names))))
+      (push (uffi:convert-from-cstring (PQfname result i)) names))))
 
 (defmethod database-execute-command (sql-expression
                                      (database postgresql-database))

diff --git a/db-sqlite/sqlite-sql.lisp b/db-sqlite/sqlite-sql.lisp
index d07be2a5f13e3814c22694d23d003ebf3476003d..8aad430963216016f3362d1bcdc59bb086060382 100644 (file)
--- a/db-sqlite/sqlite-sql.lisp
+++ b/db-sqlite/sqlite-sql.lisp
@@ -209,7 +209,7 @@
                             (:double
                              (when val
                                (coerce
-                                (read-from-string (sqlite:sqlite-aref row i))
+                                (read-from-string val)
                                 'double-float)))))))
          (sqlite:sqlite-free-row row)
          t))))

diff --git a/debian/changelog b/debian/changelog
index 3e52b317c74fe396cd18b7eb63d421081ecb0613..2f7f84b9f0b153085f2adb2844dfaa2ee4364110 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cl-sql (2.10.4-1) unstable; urgency=low
+
+  * New upstream
+
+ -- Kevin M. Rosenberg <kmr@debian.org>  Sat,  1 May 2004 13:16:04 -0600
+
 cl-sql (2.10.3-1) unstable; urgency=low
 
   * New upstream

diff --git a/sql/metaclasses.lisp b/sql/metaclasses.lisp
index 95b9c11ed6c5a14993548c740af2169ca89a3a26..b7b2e50b98f979927b5b6986ec4d760e5072905f 100644 (file)
--- a/sql/metaclasses.lisp
+++ b/sql/metaclasses.lisp
@@ -56,9 +56,9 @@
 
 ;;; Lispworks 4.2 and before requires special processing of extra slot and class options
 
-(defconstant +extra-slot-options+ '(:column :db-kind :db-reader :nulls-ok :db-constraints
+(defvar +extra-slot-options+ '(:column :db-kind :db-reader :nulls-ok :db-constraints
                                    :db-writer :db-type :db-info))
-(defconstant +extra-class-options+ '(:base-table))
+(defvar +extra-class-options+ '(:base-table))
 
 (dolist (slot-option +extra-slot-options+)
   (process-slot-option standard-db-class slot-option))

diff --git a/sql/table.lisp b/sql/table.lisp
index d2a615b8d49c8c46f853255b2b10f8ea5f02c44b..3820c19bd61d623a02ee50aeae155fe605c15789 100644 (file)
--- a/sql/table.lisp
+++ b/sql/table.lisp
@@ -249,7 +249,7 @@ specifications in table have changed."
                    ((null action)
                     (setf (gethash k attribute-cache) (list nil nil)))
                    ((eq t action)
-                    (setf (gethash k attribute-cache) (list t (second value))))))
+                    (setf (gethash k attribute-cache) (list t (second v))))))
                attribute-cache))
       ((eq table :default)
        (maphash (lambda (k v)
@@ -260,7 +260,7 @@ specifications in table have changed."
                      ((null action)
                       (setf (gethash k attribute-cache) (list nil nil)))
                      ((eq t action)
-                      (setf (gethash k attribute-cache) (list t (second value)))))))
+                      (setf (gethash k attribute-cache) (list t (second v)))))))
                attribute-cache))))
   (values))