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

diff --git a/tests/test-basic.lisp b/tests/test-basic.lisp
index a6a501e..aff45cb 100644
--- a/tests/test-basic.lisp
+++ b/tests/test-basic.lisp
@@ -38,22 +38,24 @@
   (append
    (test-basic-forms-untyped)
    '(
-     (deftest BASIC/TYPE/1
+     (deftest :BASIC/TYPE/1
 	(let ((results '()))
 	  (dolist (row (query "select * from TYPE_TABLE" :result-types :auto)
 		    results)
 	    (destructuring-bind (int float bigint str) row
 	      (push (list (integerp int)
 			  (typep float 'double-float)
-			  (if (member *test-database-type* '(:odbc :aodbc))  
-			      t
+			  (if (and (eq :odbc *test-database-type*)
+				   (eq :postgresql *test-database-underlying-type*))
+			      ;; ODBC/Postgresql returns bigints as strings
+			      (stringp bigint)
 			    (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
+     (deftest :BASIC/TYPE/2
 	 (let ((results '()))
 	   (dolist (row (query "select * from TYPE_TABLE" :result-types :auto)
 		     results)
@@ -69,14 +71,14 @@
      )))
 
 (defun test-basic-forms-untyped ()
-  '((deftest BASIC/SELECT/1
+  '((deftest :BASIC/SELECT/1
 	(let ((rows (query "select * from TYPE_TABLE" :result-types :auto)))
 	  (values 
 	   (length rows)
 	   (length (car rows))))
       11 4)
     
-    (deftest BASIC/SELECT/2
+    (deftest :BASIC/SELECT/2
 	(let ((results '()))
 	  (dolist (row (query "select * from TYPE_TABLE" :result-types nil)
 		    results)
@@ -88,7 +90,7 @@
 		    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/SELECT/3
+    (deftest :BASIC/SELECT/3
 	(let ((results '()))
 	  (dolist (row (query "select * from TYPE_TABLE" :result-types nil)
 		    results)
@@ -102,10 +104,11 @@
 		    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/MAP/1
+    (deftest :BASIC/MAP/1
 	(let ((results '())
 	      (rows (map-query 'vector #'list "select * from TYPE_TABLE" 
 			       :result-types nil)))
+	  (declare (array rows))
 	  (dotimes (i (length rows) results)
 	    (push
 	     (list
@@ -120,7 +123,7 @@
 	     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/2
+    (deftest :BASIC/MAP/2
 	(let ((results '())
 	      (rows (map-query 'list #'list "select * from TYPE_TABLE" 
 			       :result-types nil)))
@@ -138,7 +141,7 @@
 	     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
+    (deftest :BASIC/DO/1
 	(let ((results '()))
 	  (do-query ((int float bigint str) "select * from TYPE_TABLE")
 	    (push (list (double-float-equal