X-Git-Url: http://git.kpe.io/?p=clsql.git;a=blobdiff_plain;f=tests%2Ftest-basic.lisp;h=cbcd8fa715af85c59d09e78a82becc3884442e45;hp=556deb8b79dbccf8bbb3fe692b524f3adcdd9582;hb=refs%2Ftags%2Fv3.8.6;hpb=d0f147d0e7d942b379bd7cd472f26b00c33916bc

diff --git a/tests/test-basic.lisp b/tests/test-basic.lisp
index 556deb8..cbcd8fa 100644
--- a/tests/test-basic.lisp
+++ b/tests/test-basic.lisp
@@ -3,11 +3,11 @@
 ;;;; 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
 ;;;;
-;;;; $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
 ;;;;
@@ -18,149 +18,225 @@
 
 (in-package #:clsql-tests)
 
+(setq *rt-basic*
+  '(
+    (deftest :basic/type/1
+        (let ((results '()))
+          (dolist (row (query "select * from TYPE_TABLE" :result-types :auto)
+                   results)
+            (destructuring-bind (int float str) row
+              (push (list (integerp int)
+                          (typep float 'double-float)
+                          (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)))
 
-(defun test-basic (spec type)
-  (let ((db (clsql:connect spec :database-type type :if-exists :new)))
-    (unwind-protect
-	 (if (eq type :sqlite)
-	     (%test-basic-untyped db type)
-	     (%test-basic db type))
-      (disconnect :database db))))
-
-(defun %test-basic (db type)
-  (create-test-table db)
-  (dolist (row (query "select * from test_clsql" :database db :result-types :auto))
-    (test-table-row row :auto type))
-  (dolist (row (query "select * from test_clsql" :database db :result-types nil))
-    (test-table-row row nil type))
-  (loop for row across (map-query 'vector #'list "select * from test_clsql" 
-				  :database db :result-types :auto)
-	do (test-table-row row :auto type))
-  (loop for row across (map-query 'vector #'list "select * from test_clsql" 
-				  :database db :result-types nil)
-	do (test-table-row row nil type))
-  (loop for row in (map-query 'list #'list "select * from test_clsql" 
-			      :database db :result-types nil)
-	do (test-table-row row nil type))
-  (loop for row in (map-query 'list #'list "select * from test_clsql" 
-			      :database db :result-types :auto)
-	do (test-table-row row :auto type))
-  (test (map-query nil #'list "select * from test_clsql" 
-		   :database db :result-types :auto)
-	nil
-	:fail-info "Expected NIL result from map-query nil")
-  (do-query ((int float bigint str) "select * from test_clsql")
-    (test-table-row (list int float bigint str) nil type))
-  (do-query ((int float bigint str) "select * from test_clsql" :result-types :auto)
-    (test-table-row (list int float bigint str) :auto type))
-  #+ignore (drop-test-table db))
-
-
-(defun %test-basic-untyped (db type)
-  (create-test-table db)
-  (dolist (row (query "select * from test_clsql" :database db :result-types nil))
-    (test-table-row row nil type))
-  (loop for row across (map-query 'vector #'list "select * from test_clsql" 
-				  :database db :result-types nil)
-	do (test-table-row row nil type))
-  (loop for row in (map-query 'list #'list "select * from test_clsql" 
-			      :database db :result-types nil)
-	do (test-table-row row nil type))
-  
-  (do-query ((int float bigint str) "select * from test_clsql")
-    (test-table-row (list int float bigint str) nil type))
-  (drop-test-table db))
+     (deftest :basic/type/2
+         (let ((results '()))
+           (dolist (row (query "select * from TYPE_TABLE" :result-types :auto)
+                     results)
+             (destructuring-bind (int float str) row
+               (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)))
 
-;;;; Testing functions
+  (deftest :basic/select/1
+        (let ((rows (query "select * from TYPE_TABLE" :result-types :auto)))
+          (values
+           (length rows)
+           (length (car rows))))
+      11 3)
 
-(defun transform-float-1 (i)
-  (coerce (* i (abs (/ i 2)) (expt 10 (* 2 i))) 'double-float))
+    (deftest :BASIC/SELECT/2
+        (let ((results '()))
+          (dolist (row (query "select * from TYPE_TABLE" :result-types nil)
+                    results)
+            (destructuring-bind (int float str) row
+              (push (list (stringp int)
+                          (stringp float)
+                          (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)))
 
-(defun transform-bigint-1 (i)
-  (* i (expt 10 (* 3 (abs i)))))
+    (deftest :basic/select/3
+        (let ((results '()))
+          (dolist (row (query "select * from TYPE_TABLE" :result-types nil)
+                    results)
+            (destructuring-bind (int float str) row
+              (push (list (double-float-equal
+                           (transform-float-1 (parse-integer int))
+                           (parse-double float))
+                          (double-float-equal
+                           (parse-double str)
+                           (parse-double float)))
+                    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
+        (let ((results '())
+              (rows (map-query 'vector #'identity "select * from TYPE_TABLE"
+                               :result-types nil)))
+          (declare (type (simple-array list (*)) rows))
+          (dotimes (i (length rows) results)
+            (push
+             (list
+              (listp (aref rows i))
+              (length (aref rows i))
+              (eql (- i 5)
+                   (parse-integer (first (aref rows i))
+                                  :junk-allowed nil))
+              (double-float-equal
+               (transform-float-1 (parse-integer (first (aref rows i))))
+               (parse-double (second (aref rows i)))))
+             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
+        (let ((results '())
+              (rows (map-query 'list #'identity "select * from TYPE_TABLE"
+                               :result-types nil)))
+          (dotimes (i (length rows) results)
+            (push
+             (list
+              (listp (nth i rows))
+              (length (nth i rows))
+              (eql (- i 5)
+                   (parse-integer (first (nth i rows))
+                                  :junk-allowed nil))
+              (double-float-equal
+               (transform-float-1 (parse-integer (first (nth i rows))))
+               (parse-double (second (nth i rows)))))
+             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
+            (let ((results '())
+              (rows (map-query 'list #'identity "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 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)))
+
+    ;; 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)))
+              (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 str) "select * from TYPE_TABLE" :result-types :auto)
+            (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)))
+
+
+    (deftest :basic/bigint/1
+        (let ((results '()))
+          (dolist (row (query "select * from TYPE_BIGINT" :result-types :auto)
+                   results)
+            (destructuring-bind (int bigint) row
+              (push (list (integerp int)
+                          (if (and (eq :odbc *test-database-type*)
+                                   (eq :postgresql *test-database-underlying-type*))
+                              ;; ODBC/Postgresql may return returns bigints as strings or integer
+                              ;; depending upon the platform
+                              t
+                            (integerp bigint)))
+                    results))))
+      ((t t) (t t) (t t) (t t) (t t) (t t) (t t) (t t) (t t) (t t) (t t)))
+
+    ))
 
-(defun create-test-table (db)
+
+(defun test-basic-initialize ()
   (ignore-errors
-    (clsql:execute-command 
-     "DROP TABLE test_clsql" :database db))
-  (clsql:execute-command 
-   "CREATE TABLE test_clsql (t_int integer, t_float float, t_bigint BIGINT, t_str CHAR(30))" 
-   :database db)
+   (clsql:execute-command "DROP TABLE TYPE_TABLE")
+   (clsql:execute-command "DROP TABLE TYPE_BIGINT"))
+
+  (clsql:execute-command
+   "CREATE TABLE TYPE_TABLE (t_int integer, t_float double precision, t_str VARCHAR(30))")
+
+  (if (clsql-sys:db-type-has-bigint? *test-database-type*)
+    (clsql:execute-command "CREATE TABLE TYPE_BIGINT (t_int integer, t_bigint BIGINT)")
+    (clsql:execute-command "CREATE TABLE TYPE_BIGINT (t_int integer)"))
+
   (dotimes (i 11)
     (let* ((test-int (- i 5))
-	   (test-flt (transform-float-1 test-int)))
+           (test-flt (transform-float-1 test-int)))
       (clsql:execute-command
-       (format nil "INSERT INTO test_clsql VALUES (~a,~a,~a,'~a')"
-	       test-int
-	       (clsql-base:number-to-sql-string test-flt)
-	       (transform-bigint-1 test-int)
-	       (clsql-base:number-to-sql-string test-flt)
-	       )
-       :database db))))
+       (format nil "INSERT INTO TYPE_TABLE VALUES (~a,~a,'~a')"
+               test-int
+               (clsql-sys:number-to-sql-string test-flt)
+               (clsql-sys:number-to-sql-string test-flt)
+               ))
+      (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
+
+(defun transform-float-1 (i)
+  (coerce (* i (abs (/ i 2)) (expt 10 (* 2 i))) 'double-float))
+
+(defun transform-bigint-1 (i)
+  (* i (expt 10 (* 3 (abs i)))))
 
 (defun parse-double (num-str)
   (let ((*read-default-float-format* 'double-float))
     (coerce (read-from-string num-str) 'double-float)))
 
-(defun test-table-row (row types db-type)
-  (test (and (listp row)
-	     (= 4 (length row)))
-	t
-	:fail-info 
-	(format nil "Row ~S is incorrect format" row))
-  (destructuring-bind (int float bigint str) row
-    (cond
-      ((eq types :auto)
-       (test (and (integerp int)
-		  (typep float 'double-float)
-		  (or (eq db-type :aodbc)  ;; aodbc considers bigints as strings
-		      (integerp bigint)) 
-		  (stringp str))
-	     t
-	     :fail-info 
-	     (format nil "Incorrect field type for row ~S (types :auto)" row)))
-       ((null types)
-	(test (and (stringp int)
-		     (stringp float)
-		     (stringp bigint)
-		     (stringp str))
-	      t
-	      :fail-info 
-	      (format nil "Incorrect field type for row ~S (types nil)" row))
-	(when (stringp int)
-	  (setq int (parse-integer int)))
-	(setq bigint (parse-integer bigint))
-	(when (stringp float)
-	  (setq float (parse-double float))))
-       ((listp types)
-	(error "NYI")
-	)
-       (t 
-	(test t nil
-	      :fail-info
-	      (format nil "Invalid types field (~S) passed to test-table-row" types))))
-    (unless (eq db-type :sqlite)		; SQLite is typeless.
-      (test (transform-float-1 int)
-	    float
-	    :test #'double-float-equal
-	    :fail-info 
-	    (format nil "Wrong float value ~A for int ~A (row ~S)" float int row)))
-    (test float
-	  (parse-double str)
-	  :test #'double-float-equal
-	  :fail-info (format nil "Wrong string value ~A for double ~A~%Row: ~S"
-			     str float row))))
-
-
 (defun double-float-equal (a b)
   (if (zerop a)
       (if (zerop b)
-	  t
-	  nil)
+          t
+          nil)
       (let ((diff (abs (/ (- a b) a))))
-	(if (> diff (* 10 double-float-epsilon))
-	    nil
-	    t))))
-	 
-(defun drop-test-table (db)
-  (clsql:execute-command "DROP TABLE test_clsql" :database db))
+        (if (> diff (* 10 double-float-epsilon))
+            nil
+            t))))