r10077: * multiple: Apply patch from Joerg Hoehle with multiple

[clsql.git] / tests / test-basic.lisp

diff --git a/tests/test-basic.lisp b/tests/test-basic.lisp
index 1cd09d2b50fe1171da577a48444b2f093e5597a6..24ef372fb63e7c8a583208a923c906c19a499ca2 100644 (file)
--- a/tests/test-basic.lisp
+++ b/tests/test-basic.lisp
@@ -7,7 +7,7 @@
 ;;;; Author:  Kevin M. Rosenberg
 ;;;; Created: Mar 2002
 ;;;;
 ;;;; 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
 ;;;;
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002-2004 by Kevin M. Rosenberg
 ;;;;


@@ -20,7 +20,7 @@
 
 (setq *rt-basic*
   '(
 
 (setq *rt-basic*
   '(

-    (deftest :BASIC/TYPE/1
+    (deftest :basic/type/1

        (let ((results '()))
          (dolist (row (query "select * from TYPE_TABLE" :result-types :auto)
                   results)
        (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)))
 
                    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)
         (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)))
 
           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)
        (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)))
     
                    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)
        (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)))
 
                    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)))
        (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)))
     
             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)))
        (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)))
     
             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)))
            (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)))
 
                 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)))
        (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)))
 
          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
        (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)))
 
 
       ((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)
        (let ((results '()))
          (dolist (row (query "select * from TYPE_BIGINT" :result-types :auto)
                   results)