r9441: sql/classes.lisp: honor case of string tables when outputting queries

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

diff --git a/db-sqlite/sqlite-sql.lisp b/db-sqlite/sqlite-sql.lisp
index 6d7bbfa63f612627ea55e2b399e1a29ce379eb4d..d6352e965dbcddf23b9e877574d1655c5bb08121 100644 (file)
--- a/db-sqlite/sqlite-sql.lisp
+++ b/db-sqlite/sqlite-sql.lisp
@@ -45,11 +45,11 @@
                     :connection-spec connection-spec
                     :sqlite-db (sqlite:sqlite-open (first connection-spec)))
     (sqlite:sqlite-error (err)
-      (error 'clsql-connect-error
+      (error 'sql-connection-error
             :database-type database-type
             :connection-spec connection-spec
-            :errno (sqlite:sqlite-error-code err)
-            :error (sqlite:sqlite-error-message err)))))
+            :error-id (sqlite:sqlite-error-code err)
+            :message (sqlite:sqlite-error-message err)))))
 
 (defmethod database-disconnect ((database sqlite-database))
   (sqlite:sqlite-close (sqlite-db database))
@@ -67,11 +67,11 @@
                 "Result set not empty: ~@(~A~) row~:P, ~@(~A~) column~:P "
                 :format-arguments (list row-n col-n))))
     (sqlite:sqlite-error (err)
-      (error 'clsql-sql-error
+      (error 'sql-database-data-error
             :database database
             :expression sql-expression
-            :errno (sqlite:sqlite-error-code err)
-            :error (sqlite:sqlite-error-message err))))
+            :error-id (sqlite:sqlite-error-code err)
+            :message (sqlite:sqlite-error-message err))))
   t)
 
 (defstruct sqlite-result-set
@@ -105,11 +105,11 @@
              (values (nreverse rows) col-names))
          (push new-row rows)))
     (sqlite:sqlite-error (err)
-      (error 'clsql-sql-error
+      (error 'sql-database-data-error
             :database database
             :expression query-expression
-            :errno (sqlite:sqlite-error-code err)
-            :error (sqlite:sqlite-error-message err)))))
+            :error-id (sqlite:sqlite-error-code err)
+            :message (sqlite:sqlite-error-message err)))))
 
 (defmethod database-query-result-set ((query-expression string)
                                      (database sqlite-database)
@@ -134,11 +134,11 @@
                (values result-set n-col nil)
                (values result-set n-col)))))
     (sqlite:sqlite-error (err)
-      (error 'clsql-sql-error
+      (error 'sql-database-error
             :database database
             :expression query-expression
-            :errno (sqlite:sqlite-error-code err)
-            :error (sqlite:sqlite-error-message err)))))
+            :error-id (sqlite:sqlite-error-code err)
+            :message (sqlite:sqlite-error-message err)))))
 
 (defun canonicalize-result-types (result-types n-col col-names)
   (when result-types
@@ -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)