X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=db-sqlite%2Fsqlite-sql.lisp;h=3165e80f939bcfaf5d3b54f869e0b878675114d0;hb=635fd6df23f5cdc0247ec93dfdb04e1be670412e;hp=3c6d31ea7e70d46e44e7e912c98afdfa706d29eb;hpb=5148be446aee32ec705beac3fbba35f499df4fd4;p=clsql.git

diff --git a/db-sqlite/sqlite-sql.lisp b/db-sqlite/sqlite-sql.lisp
index 3c6d31e..3165e80 100644
--- a/db-sqlite/sqlite-sql.lisp
+++ b/db-sqlite/sqlite-sql.lisp
@@ -62,7 +62,7 @@
 	  (sqlite:sqlite-get-table (sqlite-db database) sql-expression)
 	(sqlite:sqlite-free-table data)
 	(unless (= row-n 0)
-	  (error 'clsql-simple-warning
+	  (error 'sql-warning
 		 :format-control
 		 "Result set not empty: ~@(~A~) row~:P, ~@(~A~) column~:P "
 		 :format-arguments (list row-n col-n))))
@@ -76,14 +76,11 @@
 
 (defstruct sqlite-result-set
   (vm (sqlite:make-null-vm)
-      #-clisp :type
-      #-clisp sqlite:sqlite-vm-pointer)
+      :type sqlite:sqlite-vm-pointer)
   (first-row (sqlite:make-null-row)
-	     #-clisp :type
-	     #-clisp sqlite:sqlite-row-pointer-type)
+	     :type sqlite:sqlite-row-pointer-type)
   (col-names (sqlite:make-null-row)
-	     #-clisp :type
-	     #-clisp sqlite:sqlite-row-pointer-type)
+	     :type sqlite:sqlite-row-pointer-type)
   (result-types nil)
   (n-col 0 :type fixnum))
 
@@ -145,12 +142,14 @@
     (let ((raw-types (if (eq :auto result-types)
 			 (loop for j from n-col below (* 2 n-col)
 			       collect (ensure-keyword (sqlite:sqlite-aref col-names j)))
-			 result-types)))
+		       result-types)))
       (loop for type in raw-types
 	    collect
 	    (case type
-	      ((:int :integer :tinyint :long :bigint)
+	      ((:int :integer :tinyint :long)
 	       :int32)
+	      (:bigint
+	       :int64)
 	      ((:float :double)
 	       :double)
 	      ((:numeric)
@@ -180,7 +179,7 @@
 		  (multiple-value-bind (n new-row col-names)
 		      (sqlite:sqlite-step (sqlite-result-set-vm result-set))
 		    (declare (ignore n col-names)
-			     #-clisp (type sqlite:sqlite-row-pointer-type new-row))
+			     (type sqlite:sqlite-row-pointer-type new-row))
 		    (if (sqlite:null-row-p new-row)
 			(return-from database-store-next-row nil)
 			(setf row new-row)))
@@ -196,29 +195,11 @@
 	  (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))
-			       (val (sqlite:sqlite-aref row i)))
-			   (case type
-			     (:string
-			      val)
-			     (:integer
-			      (when val (parse-integer val)))
-			     (:number
-			      (read-from-string val))
-			     (:double
-			      (when val
-				(coerce
-				 (read-from-string val)
-				 'double-float)))))))
+			  i)))
 	  (sqlite:sqlite-free-row row)
 	  t))))