r9329: * db-odbc/*.lisp: Add a layer of indirection to foreign-type

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

diff --git a/tests/test-init.lisp b/tests/test-init.lisp
index 65b1d8a2de0c3582cc7df42f85f5829b55e28d5d..f0ff688bfa8537c8f40db699d83f572c0db0be6f 100644 (file)
--- 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))
@@ -540,10 +540,10 @@
           (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
-                               :fdml/select/20))
+                               :fdml/select/21))
           (push (cons test "not supported by sqlite") skip-tests))
-         ((and (eql *test-database-type* :mysql)
-               (clsql-base::in test :fdml/select/21 :fdml/query/5 
+         ((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
@@ -551,16 +551,18 @@
       (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 for interactive testing."
-  (when *default-database*
-      (disconnect :database *default-database*))
-  (test-connect-to-database :mysql (car (mysql-spec (read-specs))))
-  (test-initialise-database))
+  (rapid-load :mysql))
+
+(defun rlo ()
+  (rapid-load :odbc))