r9408: 19 May 2004 Kevin Rosenberg (kevin@rosenberg.net)

[clsql.git] / db-sqlite / sqlite-sql.lisp

diff --git a/db-sqlite/sqlite-sql.lisp b/db-sqlite/sqlite-sql.lisp
index 8e1798bb99e11da5fbe166984ce4212cd44fe097..d6352e965dbcddf23b9e877574d1655c5bb08121 100644 (file)
--- a/db-sqlite/sqlite-sql.lisp
+++ b/db-sqlite/sqlite-sql.lisp
@@ -162,9 +162,10 @@
   (handler-case
       (sqlite:sqlite-finalize (sqlite-result-set-vm result-set))
     (sqlite:sqlite-error (err)
-      (error 'clsql-simple-error
-            :format-control "Error finalizing SQLite VM: ~A"
-            :format-arguments (list (sqlite:sqlite-error-message err))))))
+      (error 'sql-database-error
+            :message
+            (format nil "Error finalizing SQLite VM: ~A"
+                    (sqlite:sqlite-error-message err))))))
 
 (defmethod database-store-next-row (result-set (database sqlite-database) list)
   (let ((n-col (sqlite-result-set-n-col result-set))
@@ -184,12 +185,12 @@
                        (return-from database-store-next-row nil)
                        (setf row new-row)))
                (sqlite:sqlite-error (err)
-                 (error 'clsql-simple-error
-                        :format-control "Error in sqlite-step: ~A"
-                        :format-arguments
-                        (list (sqlite:sqlite-error-message err)))))
+                 (error 'sql-database-error
+                        :message
+                        (format nil "Error in sqlite-step: ~A"
+                                (sqlite:sqlite-error-message err)))))
 
-             ;; Use the row previously read by database-query-result-set.
+           ;; Use the row previously read by database-query-result-set.
              (setf (sqlite-result-set-first-row result-set)
                    (sqlite:make-null-row)))
          (loop for i = 0 then (1+ i)