X-Git-Url: http://git.kpe.io/?p=clsql.git;a=blobdiff_plain;f=tests%2Ftest-basic.lisp;h=6a27fdd7de0d5f1f7883bfbf2d2044235dd184d0;hp=aff45cb6ffab18cabf7fd5b8c50185aea3446312;hb=8a8ee2d7d791b7a3efaed06420802a925d16fca3;hpb=41c5da5bdc34fdc6ea25928ea0f94fcf0ff5c6e3

diff --git a/tests/test-basic.lisp b/tests/test-basic.lisp
index aff45cb..6a27fdd 100644
--- a/tests/test-basic.lisp
+++ b/tests/test-basic.lisp
@@ -3,7 +3,7 @@
 ;;;; FILE IDENTIFICATION
 ;;;;
 ;;;; Name:    test-basic.lisp
-;;;; Purpose: Tests for clsql-base and result types
+;;;; Purpose: Tests for clsql string-based queries and result types
 ;;;; Author:  Kevin M. Rosenberg
 ;;;; Created: Mar 2002
 ;;;;
@@ -29,9 +29,9 @@
       (clsql:execute-command
        (format nil "INSERT INTO TYPE_TABLE VALUES (~a,~a,~a,'~a')"
 	       test-int
-	       (clsql-base:number-to-sql-string test-flt)
+	       (clsql-sys:number-to-sql-string test-flt)
 	       (transform-bigint-1 test-int)
-	       (clsql-base:number-to-sql-string test-flt)
+	       (clsql-sys:number-to-sql-string test-flt)
 	       )))))
 
 (defun test-basic-forms ()
@@ -47,26 +47,28 @@
 			  (typep float 'double-float)
 			  (if (and (eq :odbc *test-database-type*)
 				   (eq :postgresql *test-database-underlying-type*))
-			      ;; ODBC/Postgresql returns bigints as strings
-			      (stringp bigint)
+			      ;; ODBC/Postgresql may return returns bigints as strings or integer
+			      ;; depending upon the platform
+			      t
 			    (integerp bigint))
 			  (stringp str))
 		    results))))
       ((t t t t) (t t t t) (t t t t) (t t t t) (t t t t) (t t t t) (t t t t) (t t t t) (t t t t) (t t t t) (t t t t)))
-    
 
      (deftest :BASIC/TYPE/2
 	 (let ((results '()))
 	   (dolist (row (query "select * from TYPE_TABLE" :result-types :auto)
 		     results)
 	     (destructuring-bind (int float bigint str) row
-	       (push (list (double-float-equal 
-			    (transform-float-1 int)
-			    float)
-			   (double-float-equal
-			    (parse-double str)
-			    float))
-		     results))))
+	       (setq results
+		     (cons (list (double-float-equal 
+				  (transform-float-1 int)
+				  float)
+				 (double-float-equal
+				  (parse-double str)
+				  float))
+			   results))))
+	   results)
        ((t t) (t t) (t t) (t t) (t t) (t t) (t t) (t t) (t t) (t t) (t t)))
      )))
 
@@ -95,6 +97,7 @@
 	  (dolist (row (query "select * from TYPE_TABLE" :result-types nil)
 		    results)
 	    (destructuring-bind (int float bigint str) row
+	      (declare (ignore bigint))
 	      (push (list (double-float-equal 
 			   (transform-float-1 (parse-integer int))
 			   (parse-double float))
@@ -108,7 +111,7 @@
 	(let ((results '())
 	      (rows (map-query 'vector #'list "select * from TYPE_TABLE" 
 			       :result-types nil)))
-	  (declare (array rows))
+	  (declare (type (simple-array list (*)) rows))
 	  (dotimes (i (length rows) results)
 	    (push
 	     (list
@@ -140,17 +143,52 @@
 	       (parse-double (second (nth i rows)))))
 	     results)))
       ((t 4 t t) (t 4 t t) (t 4 t t) (t 4 t t) (t 4 t t) (t 4 t t) (t 4 t t) (t 4 t t) (t 4 t t) (t 4 t t) (t 4 t t)))
+    
+    (deftest :BASIC/MAP/3
+	    (let ((results '())
+	      (rows (map-query 'list #'list "select * from TYPE_TABLE" 
+			       :result-types :auto)))
+	      (dotimes (i (length rows) results)
+		(push
+		 (list
+		  (listp (nth i rows))
+		  (length (nth i rows))
+		  (eql (- i 5)
+		       (first (nth i rows)))
+		  (double-float-equal
+		   (transform-float-1 (first (nth i rows)))
+		   (second (nth i rows))))
+		 results)))
+      ((t 4 t t) (t 4 t t) (t 4 t t) (t 4 t t) (t 4 t t) (t 4 t t) (t 4 t t) (t 4 t t) (t 4 t t) (t 4 t t) (t 4 t t)))
 
     (deftest :BASIC/DO/1
 	(let ((results '()))
-	  (do-query ((int float bigint str) "select * from TYPE_TABLE")
-	    (push (list (double-float-equal 
-			 (transform-float-1 (parse-integer int))
-			 (parse-double float))
-			(double-float-equal
-			 (parse-double str)
-			 (parse-double float)))
-		  results))
+	  (do-query ((int float bigint str) "select * from TYPE_TABLE" :result-types nil)
+	    (declare (ignore bigint))
+	    (let ((int-number (parse-integer int)))
+	      (setq results
+		    (cons (list (double-float-equal (transform-float-1
+						     int-number)
+						    (parse-double float))
+			      (double-float-equal (parse-double str)
+						  (parse-double float)))
+			results))))
+	  results)
+      ((t t) (t t) (t t) (t t) (t t) (t t) (t t) (t t) (t t) (t t) (t t)))
+
+    (deftest :BASIC/DO/2
+	(let ((results '()))
+	  (do-query ((int float bigint str) "select * from TYPE_TABLE" :result-types :auto)
+	    (declare (ignore bigint))
+	    (setq results
+		  (cons
+		   (list (double-float-equal 
+			  (transform-float-1 int)
+			  float)
+			 (double-float-equal
+			  (parse-double str)
+			  float))
+		   results)))
 	  results)
       ((t t) (t t) (t t) (t t) (t t) (t t) (t t) (t t) (t t) (t t) (t t)))
     ))