r9608: * Version 2.11.9

        * sql/conditions.lisp: Set initial slot value for message in SQL-WARNING        * sql/transactions.lisp: Correctly set slots of SQL-WARNING

diff --git a/ChangeLog b/ChangeLog
index be6f2995759d74b465e7ab37d3200a1d3e1d3507..0dc2e4b570729c12dbb28ef401e2d0d033599e63 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+13 Jun 2004 Kevin Rosenberg <kevin@rosenberg.net>
+       * Version 2.11.9
+       * sql/conditions.lisp: Set initial slot value for message in SQL-WARNING
+       * sql/transactions.lisp: Correctly set slots of SQL-WARNING
+
 12 Jun 2004 Marcus Pearce <m.t.pearce@city.ac.uk>
        * sql/package.lisp: export DATABASE-TYPE from CLSQL and subclasses 
        of SQL-EXPRESSION from CLSQL-SYS. 

diff --git a/debian/changelog b/debian/changelog
index 422a8bbceafa78d8083f812803d2ab45f2a7bd1a..57658b76d4880933c5b28383f16f5b58b99b52ad 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cl-sql (2.11.9-1) unstable; urgency=low
+
+  * New upstream
+
+ -- Kevin M. Rosenberg <kmr@debian.org>  Sun, 13 Jun 2004 15:51:35 -0700
+
 cl-sql (2.11.8-1) unstable; urgency=low
 
   * New upstream

diff --git a/sql/conditions.lisp b/sql/conditions.lisp
index dc48d2fc1201a1da10ad512041b0515621aa2975..4e3380f7e276d655a460d4af995d08029c492834 100644 (file)
--- a/sql/conditions.lisp
+++ b/sql/conditions.lisp
@@ -122,9 +122,9 @@ connection is no longer usable."))
 ;;; CLSQL Extensions
 
 (define-condition sql-warning (warning sql-condition)
-  ((message :initarg :message :reader sql-warning-message))
+  ((message :initarg :message :initform nil :reader sql-warning-message))
   (:report (lambda (c stream)
-            (format stream (sql-warning-message c)))))
+            (format stream "~A" (sql-warning-message c)))))
 
 (define-condition sql-database-warning (sql-warning)
   ((database :initarg :database :reader sql-warning-database))

diff --git a/sql/transaction.lisp b/sql/transaction.lisp
index bf368c007d8b8aaee8fbfe6fe47645d6876274db..be3e6d8fdd15c2694299b991036734d09690e189 100644 (file)
--- a/sql/transaction.lisp
+++ b/sql/transaction.lisp
@@ -52,9 +52,9 @@
          (setf autocommit (previous-autocommit transaction))
           (map nil #'funcall (commit-hooks transaction)))
         (warn 'sql-warning
-              :format-control
-             "Cannot commit transaction against ~A because there is no transaction in progress."
-              :format-arguments (list database)))))
+              :message
+             (format nil "Cannot commit transaction against ~A because there is no transaction in progress."
+                     database)))))
 
 (defmethod database-abort-transaction ((database database))
   (with-slots (transaction transaction-level autocommit) database
@@ -65,9 +65,9 @@
            (setf autocommit (previous-autocommit transaction))
             (map nil #'funcall (rollback-hooks transaction))))
         (warn 'sql-warning
-              :format-control
-             "Cannot abort transaction against ~A because there is no transaction in progress."
-              :format-arguments (list database)))))
+             :message
+             (format nil "Cannot abort transaction against ~A because there is no transaction in progress."
+                     database)))))
 
 (defun mark-transaction-committed (database)
   (when (and (transaction database)