X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=tests%2Ftest-basic.lisp;h=24ef372fb63e7c8a583208a923c906c19a499ca2;hb=035a6fe046ae78bb10c7a7d039ed1ce1028e8424;hp=bdf671f2c62e455aa1d8abc32592cb00f1de5ba5;hpb=155c60b5195d618ef93541699694d57a21be3246;p=clsql.git

diff --git a/tests/test-basic.lisp b/tests/test-basic.lisp
index bdf671f..24ef372 100644
--- a/tests/test-basic.lisp
+++ b/tests/test-basic.lisp
@@ -7,7 +7,7 @@
 ;;;; Author:  Kevin M. Rosenberg
 ;;;; Created: Mar 2002
 ;;;;
-;;;; $Id: tests.lisp 8926 2004-04-10 21:12:52Z kevin $
+;;;; $Id$
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002-2004 by Kevin M. Rosenberg
 ;;;;
@@ -20,7 +20,7 @@
 
 (setq *rt-basic*
   '(
-    (deftest :BASIC/TYPE/1
+    (deftest :basic/type/1
 	(let ((results '()))
 	  (dolist (row (query "select * from TYPE_TABLE" :result-types :auto)
 		   results)
@@ -31,7 +31,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)))
 
-     (deftest :BASIC/TYPE/2
+     (deftest :basic/type/2
 	 (let ((results '()))
 	   (dolist (row (query "select * from TYPE_TABLE" :result-types :auto)
 		     results)
@@ -47,7 +47,7 @@
 	   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/SELECT/1
+  (deftest :basic/select/1
 	(let ((rows (query "select * from TYPE_TABLE" :result-types :auto)))
 	  (values 
 	   (length rows)
@@ -65,7 +65,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)))
     
-    (deftest :BASIC/SELECT/3
+    (deftest :basic/select/3
 	(let ((results '()))
 	  (dolist (row (query "select * from TYPE_TABLE" :result-types nil)
 		    results)
@@ -79,7 +79,7 @@
 		    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 #'identity "select * from TYPE_TABLE" 
 			       :result-types nil)))
@@ -98,7 +98,8 @@
 	     results)))
       ((t 3 t t) (t 3 t t) (t 3 t t) (t 3 t t) (t 3 t t) (t 3 t t) (t 3 t t) (t 3 t t) (t 3 t t) (t 3 t t) (t 3 t t)))
     
-    (deftest :BASIC/MAP/2
+   
+    (deftest :basic/map/2
 	(let ((results '())
 	      (rows (map-query 'list #'identity "select * from TYPE_TABLE" 
 			       :result-types nil)))
@@ -116,7 +117,7 @@
 	     results)))
       ((t 3 t t) (t 3 t t) (t 3 t t) (t 3 t t) (t 3 t t) (t 3 t t) (t 3 t t) (t 3 t t) (t 3 t t) (t 3 t t) (t 3 t t)))
     
-    (deftest :BASIC/MAP/3
+    (deftest :basic/map/3
 	    (let ((results '())
 	      (rows (map-query 'list #'identity "select * from TYPE_TABLE" 
 			       :result-types :auto)))
@@ -133,7 +134,16 @@
 		 results)))
       ((t 3 t t) (t 3 t t) (t 3 t t) (t 3 t t) (t 3 t t) (t 3 t t) (t 3 t t) (t 3 t t) (t 3 t t) (t 3 t t) (t 3 t t)))
 
-    (deftest :BASIC/DO/1
+    ;; confirm that a query on a single element returns a list of one element
+    (deftest :basic/map/4
+	(let ((rows (map-query 'list #'identity "select t_int from TYPE_TABLE" 
+			       :result-types nil)))
+	  (values
+	   (consp (first rows))
+	   (length (first rows))))
+      t 1)
+    
+    (deftest :basic/do/1
 	(let ((results '()))
 	  (do-query ((int float str) "select * from TYPE_TABLE" :result-types nil)
 	    (let ((int-number (parse-integer int)))
@@ -147,7 +157,7 @@
 	  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
+    (deftest :basic/do/2
 	(let ((results '()))
 	  (do-query ((int float str) "select * from TYPE_TABLE" :result-types :auto)
 	    (setq results
@@ -163,7 +173,7 @@
       ((t t) (t t) (t t) (t t) (t t) (t t) (t t) (t t) (t t) (t t) (t t)))
 
 
-    (deftest :BASIC/BIGINT/1
+    (deftest :basic/bigint/1
 	(let ((results '()))
 	  (dolist (row (query "select * from TYPE_BIGINT" :result-types :auto)
 		   results)
@@ -202,11 +212,12 @@
 	       (clsql-sys:number-to-sql-string test-flt)
 	       (clsql-sys:number-to-sql-string test-flt)
 	       ))
-      (clsql:execute-command
-       (format nil "INSERT INTO TYPE_BIGINT VALUES (~a,~a)"
-	       test-int
-	       (transform-bigint-1 test-int)
-	       )))))
+      (when (clsql-sys:db-type-has-bigint? *test-database-type*)
+	(clsql:execute-command
+	 (format nil "INSERT INTO TYPE_BIGINT VALUES (~a,~a)"
+		 test-int
+		 (transform-bigint-1 test-int)
+		 ))))))
 
 ;;;; Testing functions