Automated commit for debian release 6.7.2-1

[clsql.git] / sql / conditions.lisp

diff --git a/sql/conditions.lisp b/sql/conditions.lisp
index 6fc1af5aa4017a980f9b356ea11a7084265cbb5b..e19805248bd5e6f9601a98db29a3e76157741238 100644 (file)
--- a/sql/conditions.lisp
+++ b/sql/conditions.lisp
@@ -151,13 +151,14 @@ connection is no longer usable."))
 
 (defun error-converting-value (val type &optional (database *default-database*))
   (restart-case 
 
 (defun error-converting-value (val type &optional (database *default-database*))
   (restart-case 

-      (error 'sql-value-conversion-error
-             :expected-type type :value val :database database)
+      (error (make-condition
+              'sql-value-conversion-error
+              :expected-type type :value val :database database))
+    (continue ()
+      :report "Continue using the unconverted value"
+      (values val t))

     (use-value (new-val)
     (use-value (new-val)

-      :report
-      (lambda (stream)
-        (write-sequence
-         "Use a different value instead of this failed conversion" stream))
+      :report "Use a different value instead of this failed conversion"

       (values new-val t)
       )))
 
       (values new-val t)
       )))