From: Kevin M. Rosenberg <kevin@rosenberg.net>
Date: Sat, 1 May 2004 19:32:19 +0000 (+0000)
Subject: r9190: few bug fixes
X-Git-Tag: v3.8.6~565
X-Git-Url: http://git.kpe.io/?p=clsql.git;a=commitdiff_plain;h=270e7b5d19d51c1a19d30b54996d89576c63d358

r9190: few bug fixes
---

diff --git a/ChangeLog b/ChangeLog
index f7bb357..7b57d6a 100644
--- 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 156e11e..47df535 100644
--- 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 d07be2a..8aad430 100644
--- 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 3e52b31..2f7f84b 100644
--- 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 95b9c11..b7b2e50 100644
--- 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 d2a615b..3820c19 100644
--- 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))