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 b554625387ef557edc4a8376b5bfb877ba797f9f..981046e51f0d59b48efdd13c98ef09c3abed54ad 100644
(file)
--- a/
tests/test-init.lisp
+++ b/
tests/test-init.lisp
@@
-19,6
+19,7
@@
(defvar *report-stream* *standard-output* "Stream to send text report.")
(defvar *sexp-report-stream* nil "Stream to send sexp report.")
(defvar *rt-connection*)
(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-basic*)
(defvar *rt-fddl*)
(defvar *rt-fdml*)
(defvar *rt-ooddl*)
(defvar *rt-fddl*)
(defvar *rt-fdml*)
(defvar *rt-ooddl*)
@@
-181,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
@@
-219,7
+222,6
@@
(defun test-initialise-database ()
(test-basic-initialize)
(defun test-initialise-database ()
(test-basic-initialize)
-
(let ((*backend-warning-behavior*
(if (member *test-database-type* '(:postgresql :postgresql-socket))
:ignore
(let ((*backend-warning-behavior*
(if (member *test-database-type* '(:postgresql :postgresql-socket))
:ignore
@@
-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*)
"")
))
@@
-526,11
+528,9
@@
(defun compute-tests-for-backend (db-type db-underlying-type)
(defun compute-tests-for-backend (db-type db-underlying-type)
- (declare (ignorable db-type))
(let ((test-forms '())
(skip-tests '()))
(let ((test-forms '())
(skip-tests '()))
- (dolist (test-form (append (test-basic-forms)
- *rt-connection* *rt-fddl* *rt-fdml*
+ (dolist (test-form (append *rt-connection* *rt-basic* *rt-fddl* *rt-fdml*
*rt-ooddl* *rt-oodml* *rt-syntax*))
(let ((test (second test-form)))
(cond
*rt-ooddl* *rt-oodml* *rt-syntax*))
(let ((test (second test-form)))
(cond
@@
-556,9
+556,12
@@
:fdml/select/21 :fdml/select/32
:fdml/select/33))
(push (cons test "not supported by sqlite") skip-tests))
:fdml/select/21 :fdml/select/32
:fdml/select/33))
(push (cons test "not supported by sqlite") skip-tests))
+ ((and (not (clsql-sys:db-type-has-bigint? db-type))
+ (clsql-sys:in test :basic/bigint/1))
+ (push (cons test "bigint not supported") skip-tests))
((and (eql *test-database-underlying-type* :mysql)
(clsql-sys:in test :fdml/select/26))
((and (eql *test-database-underlying-type* :mysql)
(clsql-sys:in test :fdml/select/26))
- (push (cons test "string table aliases not supported") skip-tests))
+ (push (cons test "string table aliases not supported
on all mysql versions
") skip-tests))
((and (eql *test-database-underlying-type* :mysql)
(clsql-sys:in test :fdml/select/22 :fdml/query/5
:fdml/query/7 :fdml/query/8))
((and (eql *test-database-underlying-type* :mysql)
(clsql-sys:in test :fdml/select/22 :fdml/query/5
:fdml/query/7 :fdml/query/8))
@@
-571,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))
@@
-585,4
+589,4
@@
(rapid-load :mysql))
(defun rlo ()
(rapid-load :mysql))
(defun rlo ()
- (rapid-load :o
dbc
))
+ (rapid-load :o
racle
))