X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=tests%2Ftest-init.lisp;h=f0ff688bfa8537c8f40db699d83f572c0db0be6f;hb=09f07ac9d914a83f9426609f3264f4e66b5a6d97;hp=76a7bffc6496f97fc03f70d3b7a05ae5cf0312b6;hpb=7500a5933c56c68b1ecb16092415d0412efee05e;p=clsql.git

diff --git a/tests/test-init.lisp b/tests/test-init.lisp
index 76a7bff..f0ff688 100644
--- a/tests/test-init.lisp
+++ b/tests/test-init.lisp
@@ -16,7 +16,7 @@
 
 (in-package #:clsql-tests)
 
-(defvar *report-stream* nil "Stream to send text report.")
+(defvar *report-stream* *standard-output* "Stream to send text report.")
 (defvar *sexp-report-stream* nil "Stream to send sexp report.")
 (defvar *rt-connection*)
 (defvar *rt-fddl*)
@@ -145,7 +145,7 @@
     :type (string 30)
     :initarg :city)
    (postal-code
-    :column "zip"
+    :column zip
     :type integer
     :void-value 0
     :initarg :postal-code))
@@ -539,16 +539,30 @@
 		(clsql-base::in test :fdml/select/1))
 	   (push (cons test "fancy math not supported") skip-tests))
 	  ((and (eql *test-database-type* :sqlite)
-		(clsql-base::in test :fddl/view/4 :fdml/select/10))
+		(clsql-base::in test :fddl/view/4 :fdml/select/10
+				:fdml/select/21))
 	   (push (cons test "not supported by sqlite") skip-tests))
+	  ((and (eql *test-database-underlying-type* :mysql)
+		(clsql-base::in test :fdml/select/22 :fdml/query/5 
+				:fdml/query/7 :fdml/query/8))
+	   (push (cons test "not supported by mysql") skip-tests))
 	  (t
 	   (push test-form test-forms)))))
-    (values (nreverse test-forms) (nreverse skip-tests))))
+      (values (nreverse test-forms) (nreverse skip-tests))))
 
 
-(defun rl ()
+(defun rapid-load (type)
   "Rapid load for interactive testing."
   (when *default-database*
       (disconnect :database *default-database*))
-  (test-connect-to-database :postgresql (car (postgresql-spec (read-specs))))
+  (test-connect-to-database type (car (db-type-spec type (read-specs))))
   (test-initialise-database))
+
+(defun rl ()
+  (rapid-load :postgresql))
+
+(defun rlm ()
+  (rapid-load :mysql))
+
+(defun rlo ()
+  (rapid-load :odbc))