projects
/
clsql.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r9461: 24 May 2004 Kevin Rosenberg <kevin@rosenberg.net>
[clsql.git]
/
tests
/
test-init.lisp
diff --git
a/tests/test-init.lisp
b/tests/test-init.lisp
index 35b08e2f6ddc7765c81f86e625c28f7bcc892bf4..981046e51f0d59b48efdd13c98ef09c3abed54ad 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)
(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
;; Connect to the database
(clsql:connect spec
@@
-468,7
+470,7
@@
*** CLSQL ~A begun at ~A
*** ~A
*** ~A on ~A
*** CLSQL ~A begun at ~A
*** ~A
*** ~A on ~A
-*** Database ~
A
backend~A.
+*** Database ~
:@(~A~)
backend~A.
******************************************************************************
"
report-type
******************************************************************************
"
report-type
@@
-480,7
+482,7
@@
(machine-type)
db-type
(if (not (eq db-type *test-database-underlying-type*))
(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*)
"")
))
*test-database-underlying-type*)
"")
))
@@
-572,12
+574,13
@@
(values (nreverse test-forms) (nreverse skip-tests))))
(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*))
"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))
(defun rl ()
(rapid-load :postgresql))