r8873: better generic function

diff --git a/ChangeLog b/ChangeLog
index d266e088434c80d0f238c5c58084f514f689b910..a4b5bb764504a8b4ce5c1720b2c47ab7774e1158 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+06 Apr 2004 Kevin Rosenberg (kevin@rosenberg.net)
+        * db-*/*-sql.lisp: Ensure that expr in
+       database-query-result-set is a string
+       
 06 Apr 2004 Kevin Rosenberg (kevin@rosenberg.net)
        * With for Marcus Pearce's excellent work, I've merged
        his clsql-usql port into clsql. The original clsql

diff --git a/db-aodbc/aodbc-sql.lisp b/db-aodbc/aodbc-sql.lisp
index b55cb411e574612850f15cf23cc4dd066e260b3b..56472113b5d34f7f01c9784c07a38717e627988d 100644 (file)
--- a/db-aodbc/aodbc-sql.lisp
+++ b/db-aodbc/aodbc-sql.lisp
@@ -101,7 +101,8 @@
   (types nil :type cons)
   (full-set nil :type boolean))
 
-(defmethod database-query-result-set (query-expression (database aodbc-database) 
+(defmethod database-query-result-set ((query-expression string)
+                                     (database aodbc-database) 
                                      &key full-set types)
   #+aodbc-v2
   (handler-case 

diff --git a/db-mysql/mysql-sql.lisp b/db-mysql/mysql-sql.lisp
index b8e394c0eaea9e676ca5c1487a61a1cfb5ca84f5..c33456c6050fdc33f716b134aaef30c2ecef43ff 100644 (file)
--- a/db-mysql/mysql-sql.lisp
+++ b/db-mysql/mysql-sql.lisp
@@ -225,7 +225,7 @@
   (full-set nil :type boolean))
 
 
-(defmethod database-query-result-set (query-expression 
+(defmethod database-query-result-set ((query-expression string)
                                      (database mysql-database)
                                      &key full-set types)
   (uffi:with-cstring (query-native query-expression)

diff --git a/db-oracle/oracle-sql.lisp b/db-oracle/oracle-sql.lisp
index 7d605933c1953ea32be291a9f560f3f3579e5141..3a898e176c1b4cc25df0ad3fbfdd1f2e7d6643c1 100644 (file)
--- a/db-oracle/oracle-sql.lisp
+++ b/db-oracle/oracle-sql.lisp
@@ -797,7 +797,9 @@ the length of that format.")))
     (prin1 (qc-db qc) stream)))
 
 
-(defmethod database-query-result-set (query-expression (database oracle-database) &optional full-set)
+(defmethod database-query-result-set ((query-expression string)
+                                     (database oracle-database) 
+                                     &key full-set types)
   )
 
 (defmethod database-dump-result-set (result-set (database oracle-database))

diff --git a/db-postgresql-socket/postgresql-socket-sql.lisp b/db-postgresql-socket/postgresql-socket-sql.lisp
index cdaa9e80e5d19523439d54b861cd533fea17197d..5546017682ecd16497dfd1fe52b6a22d7da955f2 100644 (file)
--- a/db-postgresql-socket/postgresql-socket-sql.lisp
+++ b/db-postgresql-socket/postgresql-socket-sql.lisp
@@ -265,9 +265,9 @@ doesn't depend on UFFI."
   (cursor nil)
   (types nil))
 
-(defmethod database-query-result-set (expression (database postgresql-socket-database) 
-                                     &key full-set types
-     )
+(defmethod database-query-result-set ((expression string)
+                                     (database postgresql-socket-database) 
+                                     &key full-set types)
   (declare (ignore full-set))
   (let ((connection (database-connection database)))
     (with-postgresql-handlers (database expression)

diff --git a/db-postgresql/postgresql-sql.lisp b/db-postgresql/postgresql-sql.lisp
index c268b82eb2d9463ab15c77d0b79c88f7dff7a706..394c0d629d73865d5014dba2ed16aee930b4d13b 100644 (file)
--- a/db-postgresql/postgresql-sql.lisp
+++ b/db-postgresql/postgresql-sql.lisp
@@ -216,7 +216,8 @@
   (num-fields 0 :type integer)
   (tuple-index 0 :type integer))
 
-(defmethod database-query-result-set (query-expression (database postgresql-database) 
+(defmethod database-query-result-set ((query-expression string)
+                                     (database postgresql-database) 
                                       &key full-set types)
   (let ((conn-ptr (database-conn-ptr database)))
     (declare (type pgsql-conn-def conn-ptr))

diff --git a/db-sqlite/sqlite-sql.lisp b/db-sqlite/sqlite-sql.lisp
index 41255ef84b8e3e5f3c9208c320ef4aee404c532f..6fd3f0746a2ab663bc1c1f3eda881ffe91360279 100644 (file)
--- a/db-sqlite/sqlite-sql.lisp
+++ b/db-sqlite/sqlite-sql.lisp
@@ -112,7 +112,7 @@
   (n-col 0 :type fixnum))
 
 (defmethod database-query-result-set
-    (query-expression (database sqlite-database) &key full-set types)
+    ((query-expression string) (database sqlite-database) &key full-set types)
   (declare (ignore full-set types))
   (handler-case
       (let* ((vm (sqlite:sqlite-compile (sqlite-db database)

diff --git a/debian/changelog b/debian/changelog
index e87efbed8eafdc60a1aa1dcf93c2c520254e586b..9a394b82ef58ab2719406220b2ac372301935d16 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cl-sql (2.3.2-2) unstable; urgency=low
+
+  * New upstreamc
+
+ -- Kevin M. Rosenberg <kmr@debian.org>  Wed,  7 Apr 2004 14:20:12 -0600
+
 cl-sql (2.3.2-1) unstable; urgency=low
 
   * New upstream