X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=tests%2Ftest-init.lisp;h=65930c2e9d858b2945074fdc330026b29ad28f33;hb=1df8353cc15bcbf98078605cb6955aafa622ecea;hp=35b08e2f6ddc7765c81f86e625c28f7bcc892bf4;hpb=155c60b5195d618ef93541699694d57a21be3246;p=clsql.git

diff --git a/tests/test-init.lisp b/tests/test-init.lisp
index 35b08e2..65930c2 100644
--- a/tests/test-init.lisp
+++ b/tests/test-init.lisp
@@ -182,8 +182,10 @@
     (ignore-errors (create-database spec :database-type db-type)))
   
   (setf *test-database-type* db-type)
-  (when (>= (length spec) 3)
-    (setq *test-database-user* (third spec)))
+  (setf *test-database-user*
+    (cond
+     ((eq :oracle db-type) (second spec))
+     ((>= (length spec) 3) (third spec))))
   
   ;; Connect to the database
   (clsql:connect spec
@@ -468,7 +470,7 @@
 ***     CLSQL ~A begun at ~A
 ***     ~A
 ***     ~A on ~A
-***     Database ~A backend~A.
+***     Database ~:@(~A~) backend~A.
 ******************************************************************************
 "
 	  report-type
@@ -480,7 +482,7 @@
 	  (machine-type)
 	  db-type
 	  (if (not (eq db-type *test-database-underlying-type*))
-	      (format nil " with underlying type ~A" 
+	      (format nil " with underlying type ~:@(~A~)" 
 		      *test-database-underlying-type*)
 	      "")
 	  ))
@@ -567,17 +569,21 @@
 	  ((and (null (clsql-sys:db-type-has-union? db-underlying-type))
 		(clsql-sys:in test :fdml/query/6 :fdml/select/31))
 	   (push (cons test "union not supported") skip-tests))
+	  ((and (eq *test-database-type* :oracle)
+		(clsql-sys:in test :fdml/query/8 :fdml/select/21))
+	   (push (cons test "syntax not supported") skip-tests))
 	  (t
 	   (push test-form test-forms)))))
       (values (nreverse test-forms) (nreverse skip-tests))))
 
 
-(defun rapid-load (type)
+(defun rapid-load (type &optional (position 0))
   "Rapid load for interactive testing."
   (when *default-database*
       (disconnect :database *default-database*))
-  (test-connect-to-database type (car (db-type-spec type (read-specs))))
-  (test-initialise-database))
+  (test-connect-to-database type (nth position (db-type-spec type (read-specs))))
+  (test-initialise-database)
+  *default-database*)
 
 (defun rl ()
   (rapid-load :postgresql))