projects
/
clsql.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r8940: change db closing
[clsql.git]
/
base
/
conditions.lisp
diff --git
a/base/conditions.lisp
b/base/conditions.lisp
index d5a918ade3ad10388a10d906cc8d4c0ee04cbd75..f6f7e7f0364c165a926b229adf629529ba9e5a07 100644
(file)
--- a/
base/conditions.lisp
+++ b/
base/conditions.lisp
@@
-145,12
+145,11
@@
and signal an clsql-invalid-spec-error if they don't match."
(format stream "The database ~A has already been closed."
(clsql-closed-error-database c)))))
(format stream "The database ~A has already been closed."
(clsql-closed-error-database c)))))
-(define-condition clsql-no
db
-error (clsql-error)
- ((database :initarg :database :reader clsql-no
db
-error-database))
+(define-condition clsql-no
-database
-error (clsql-error)
+ ((database :initarg :database :reader clsql-no
-database
-error-database))
(:report (lambda (c stream)
(:report (lambda (c stream)
- (format stream "No such database ~S is open."
- (clsql-nodb-error-database c)))))
-
+ (format stream "~S is not a CLSQL database."
+ (clsql-no-database-error-database c)))))
;; Signal conditions
;; Signal conditions
@@
-160,14
+159,8
@@
and signal an clsql-invalid-spec-error if they don't match."
'clsql-closed-error
:database database))
'clsql-closed-error
:database database))
-(defun signal-nodb-error (database)
- (cerror "Ignore this error and return nil."
- 'clsql-nodb-error
- :database database))
-
-(defun signal-no-database-error ()
- (cerror "Ignore this error and return nil."
- 'clsql-nodb-error))
+(defun signal-no-database-error (database)
+ (error 'clsql-no-database-error :database database))
(define-condition clsql-type-error (clsql-error clsql-condition)
((slotname :initarg :slotname
(define-condition clsql-type-error (clsql-error clsql-condition)
((slotname :initarg :slotname