X-Git-Url: http://git.kpe.io/?p=clsql.git;a=blobdiff_plain;f=tests%2Ftest-basic.lisp;h=4d277e358d14ba2c722940c36e02df888371048d;hp=b4cec793479b444078cc0afba61d594c05170656;hb=374df8f34a7214e08fc4cfc5d734d024acdbf9ca;hpb=d107be8f0cad113b96b6cfe443cc4d7c08126db4

diff --git a/tests/test-basic.lisp b/tests/test-basic.lisp
index b4cec79..4d277e3 100644
--- a/tests/test-basic.lisp
+++ b/tests/test-basic.lisp
@@ -3,13 +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 $
-;;;;
-;;;; This file, part of CLSQL, is Copyright (c) 2002-2004 by Kevin M. Rosenberg
+;;;; This file, part of CLSQL, is Copyright (c) 2002-2010 by Kevin M. Rosenberg
 ;;;;
 ;;;; CLSQL users are granted the rights to distribute and use this software
 ;;;; as governed by the terms of the Lisp Lesser GNU Public License
@@ -19,57 +17,264 @@
 (in-package #:clsql-tests)
 
 
-(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))
+(setq *rt-basic*
+  '(
+    (deftest :basic/type/1
+	(with-dataset *ds-basic*
+	  (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)))
+
+    (deftest :basic/type/2
+	(with-dataset *ds-basic*
+	  (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)))
+
+    (deftest :basic/select/1
+	(with-dataset *ds-basic*
+	  (let ((rows (query "select * from TYPE_TABLE" :result-types :auto)))
+	    (values
+	      (length rows)
+	      (length (car rows)))))
+      11 3)
+
+    (deftest :BASIC/SELECT/2
+	(with-dataset *ds-basic*
+	  (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)))
+
+    (deftest :basic/select/3
+	(with-dataset *ds-basic*
+	  (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
+	(with-dataset *ds-basic*
+	  (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
+	(with-dataset *ds-basic*
+	  (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
+	(with-dataset *ds-basic*
+	  (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
+	(with-dataset *ds-basic*
+	  (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
+	(with-dataset *ds-basic*
+	  (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
+	(with-dataset *ds-basic*
+	  (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
+	(with-dataset *ds-bigint*
+	  (let ((results '()))
+	    (dolist (row (query "select * from TYPE_BIGINT" :result-types :auto)
+		     results)
+	      (destructuring-bind (int bigint) row
+		(push (list (integerp int)
+                            (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)))
+
+
+    (deftest :basic/bigtext/1
+	(with-dataset *ds-bigtext*
+	  (let* ((len 7499)
+		 (str (make-string len :initial-element #\a))
+		 (cmd (format nil "INSERT INTO testbigtext (a) VALUES ('~a')" str)))
+	    (execute-command cmd)
+	    (let ((a (first (query "SELECT a from testbigtext"
+				   :flatp t :field-names nil))))
+	      (assert (string= str a) (str a)
+		      "mismatch on a. inserted: ~a returned: ~a" len (length a)))
+	    ))
+      nil)
+    (deftest :basic/bigtext/2
+     (flet ((random-char ()
+              (let ((alphabet "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ")
+                    (idx (random 52)))
+                (elt alphabet idx))))
+       (dotimes (n 10)
+         (with-dataset *ds-bigtext*
+           (let* ((len (random 7500))
+                  (str (coerce (make-array len
+                                           :initial-contents (loop repeat len collect (random-char)))
+                               'string))
+                  (cmd (format nil "INSERT INTO testbigtext (a) VALUES ('~a')" str)))
+             (execute-command cmd)
+             (let ((a (first (query "SELECT a from testbigtext"
+                                    :flatp t :field-names nil))))
+               (assert (string= str a) (str a)
+                       "mismatch on randomized bigtext(~a) inserted: ~s returned: ~s" len str a))
+             ))))
+     nil)
+
+    (deftest :basic/reallybigintegers/1
+        (with-dataset *ds-reallybigintegers*
+          (let* ((a (1- (expt 2 64)))
+                 (b (- (expt 2 64) 2))
+                 (c (expt 2 63))
+                 (d (expt 2 62))
+                 (sql (format nil "INSERT INTO testreallybigintegers
+                              VALUES (~A, ~A, ~A, ~A)"
+                              a b c d)))
+            (query sql)
+            (let ((results
+                    (query
+                     (format nil "SELECT * FROM testreallybigintegers"))))
+              (equal `(,a ,b ,c ,d) (car results)))))
+      t)
+    ))
+
+
+(def-dataset *ds-basic*
+  (:setup (lambda ()
+	    (ignore-errors
+	      (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))")
+
+	    (dotimes (i 11)
+	      (let* ((test-int (- i 5))
+		     (test-flt (transform-float-1 test-int)))
+		(clsql:execute-command
+		 (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)
+			 ))))))
+  (:cleanup "DROP TABLE TYPE_TABLE"))
+
+(def-dataset *ds-bigint*
+  (:setup (lambda ()
+	    (ignore-errors (clsql:execute-command "DROP TABLE TYPE_BIGINT"))
+	    (clsql:execute-command "CREATE TABLE TYPE_BIGINT (T_INT integer, T_BIGINT BIGINT)")
+	    (dotimes (i 11)
+	      (clsql:execute-command
+	       (format nil "INSERT INTO TYPE_BIGINT VALUES (~a,~a)"
+		       (- i 5)
+		       (transform-bigint-1 (- i 5)))))))
+  (:cleanup "DROP TABLE TYPE_BIGINT"))
 
 ;;;; Testing functions
 
@@ -79,79 +284,10 @@
 (defun transform-bigint-1 (i)
   (* i (expt 10 (* 3 (abs i)))))
 
-(defun create-test-table (db)
-  (ignore-errors
-    (clsql:execute-command 
-     "DROP TABLE test_clsql" :database db))
-  (clsql:execute-command 
-   "CREATE TABLE test_clsql (t_int integer, t_float double precision, t_bigint BIGINT, t_str CHAR(30))" 
-   :database db)
-  (dotimes (i 11)
-    (let* ((test-int (- i 5))
-	   (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))))
-
 (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)
@@ -161,6 +297,18 @@
 	(if (> diff (* 10 double-float-epsilon))
 	    nil
 	    t))))
-	 
-(defun drop-test-table (db)
-  (clsql:execute-command "DROP TABLE test_clsql" :database db))
+
+(def-dataset *ds-bigtext*
+  (:setup "CREATE TABLE testbigtext(a varchar(7500))")
+  (:cleanup "DROP TABLE testbigtext"))
+
+(def-dataset *ds-reallybigintegers*
+  (:setup (lambda ()
+            (ignore-errors
+             (clsql:execute-command "DROP TABLE testreallybigintegers"))
+            (clsql:execute-command
+             "CREATE TABLE testreallybigintegers( a BIGINT UNSIGNED,
+                                                  b BIGINT UNSIGNED,
+                                                  c BIGINT UNSIGNED,
+                                                  d BIGINT UNSIGNED )")))
+  (:cleanup "DROP TABLE testreallybigintegers"))