From 02c30e92614a52c892cc678933586f71c76fcf30 Mon Sep 17 00:00:00 2001 From: "Kevin M. Rosenberg" Date: Wed, 7 Apr 2004 20:22:06 +0000 Subject: [PATCH] r8873: better generic function --- ChangeLog | 4 ++++ db-aodbc/aodbc-sql.lisp | 3 ++- db-mysql/mysql-sql.lisp | 2 +- db-oracle/oracle-sql.lisp | 4 +++- db-postgresql-socket/postgresql-socket-sql.lisp | 6 +++--- db-postgresql/postgresql-sql.lisp | 3 ++- db-sqlite/sqlite-sql.lisp | 2 +- debian/changelog | 6 ++++++ 8 files changed, 22 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index d266e08..a4b5bb7 100644 --- 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 b55cb41..5647211 100644 --- 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 b8e394c..c33456c 100644 --- 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 7d60593..3a898e1 100644 --- 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 cdaa9e8..5546017 100644 --- 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 c268b82..394c0d6 100644 --- 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 41255ef..6fd3f07 100644 --- 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 e87efbe..9a394b8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +cl-sql (2.3.2-2) unstable; urgency=low + + * New upstreamc + + -- Kevin M. Rosenberg Wed, 7 Apr 2004 14:20:12 -0600 + cl-sql (2.3.2-1) unstable; urgency=low * New upstream -- 2.34.1