X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=db-sqlite%2Fsqlite-sql.lisp;h=8e1798bb99e11da5fbe166984ce4212cd44fe097;hb=8c6c643e3debe875bd14408cc3129d8148dfd125;hp=d07be2a5f13e3814c22694d23d003ebf3476003d;hpb=7cdc9aa48baa3c52923d61da6fa632eb47ac0b5d;p=clsql.git

diff --git a/db-sqlite/sqlite-sql.lisp b/db-sqlite/sqlite-sql.lisp
index d07be2a..8e1798b 100644
--- 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
@@ -150,7 +150,7 @@
 	    collect
 	    (case type
 	      ((:int :integer :tinyint :long :bigint)
-	       :integer)
+	       :int32)
 	      ((:float :double)
 	       :double)
 	      ((:numeric)
@@ -195,6 +195,13 @@
 	  (loop for i = 0 then (1+ i)
 		for rest on list
 		do (setf (car rest)
+			 #-clisp
+			 (clsql-uffi:convert-raw-field
+			  (uffi:deref-array
+			   (uffi:deref-pointer row 'sqlite:sqlite-row-pointer) '(:array (* :unsigned-char)) i)
+			  result-types
+			  i)
+			 #+clisp
 			 (let ((type (if result-types
 					 (nth i result-types)
 					 :string))
@@ -209,7 +216,7 @@
 			     (:double
 			      (when val
 				(coerce
-				 (read-from-string (sqlite:sqlite-aref row i))
+				 (read-from-string val)
 				 'double-float)))))))
 	  (sqlite:sqlite-free-row row)
 	  t))))