(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
*** CLSQL ~A begun at ~A
*** ~A
*** ~A on ~A
-*** Database ~A backend~A.
+*** Database ~:@(~A~) backend~A.
******************************************************************************
"
report-type
(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))