From cc7abc6063ff8a803064c75c400ec7d31fd29a21 Mon Sep 17 00:00:00 2001 From: "Kevin M. Rosenberg" Date: Sun, 13 Jun 2004 22:16:01 +0000 Subject: [PATCH] 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 --- ChangeLog | 5 +++++ debian/changelog | 6 ++++++ sql/conditions.lisp | 4 ++-- sql/transaction.lisp | 12 ++++++------ 4 files changed, 19 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index be6f299..0dc2e4b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +13 Jun 2004 Kevin Rosenberg + * 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 * 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 422a8bb..57658b7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +cl-sql (2.11.9-1) unstable; urgency=low + + * New upstream + + -- Kevin M. Rosenberg 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 dc48d2f..4e3380f 100644 --- 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 bf368c0..be3e6d8 100644 --- 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) -- 2.34.1