:reader sql-error-connection-spec))
(:report (lambda (c stream)
(format stream "While trying to connect to database ~A~% using database-type ~A:~% Error ~D / ~A~% has occurred."
- (database-name-from-spec
- (sql-error-connection-spec c)
- (sql-error-database-type c))
+ (when (and (sql-error-connection-spec c)
+ (sql-error-database-type c))
+ (database-name-from-spec
+ (sql-error-connection-spec c)
+ (sql-error-database-type c)))
(sql-error-database-type c)
(sql-error-error-id c)
(sql-error-database-message c))))
(defun signal-closed-database-error (database)
(error 'sql-fatal-error
:database database
+ :connection-spec (when database (connection-spec database))
+ :database-type (when database (database-type database))
:message "Database is closed."))
(defun signal-no-database-error (database)
;;; 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))