r9430: correctly obtain server and client versions of oracle.

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

diff --git a/tests/test-init.lisp b/tests/test-init.lisp
index 35b08e2f6ddc7765c81f86e625c28f7bcc892bf4..543ab871f6bfefebd69093f8cadeb4478cfeb3df 100644 (file)
--- 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
@@ -577,7 +579,8 @@
   (when *default-database*
       (disconnect :database *default-database*))
   (test-connect-to-database type (car (db-type-spec type (read-specs))))
-  (test-initialise-database))
+  (test-initialise-database)
+  *default-database*)
 
 (defun rl ()
   (rapid-load :postgresql))