(defvar *test-database-type* nil)
(defvar *test-database-underlying-type* nil)
(defvar *test-database-user* nil)
+(defvar *test-false-database-user* "adsfjalsdkfjlakjsdfl"
+ "For testing ownership, a user that isn't the owner.")
(defvar *test-start-utime* nil)
(defvar *test-connection-spec* nil)
(defvar *test-connection-db-type* nil)
(setf *test-database-type* db-type)
(setf *test-database-user*
(cond
- ((eq :oracle db-type) (second spec))
+ ((member db-type '(:oracle :odbc :aodbc)) (second spec))
((>= (length spec) 3) (third spec))))
;; Connect to the database
(when (db-type-spec db-type specs)
(clsql-sys:initialize-database-type :database-type db-type))))
-(defun write-report-banner (report-type db-type stream)
+(defun write-report-banner (report-type db-type stream db-name)
(format stream
"~&
******************************************************************************
*** CLSQL ~A begun at ~A
*** ~A
*** ~A on ~A
-*** Database ~:@(~A~) backend~A.
+*** Database ~:@(~A~)
+*** Type: ~:@(~A~) backend~A.
******************************************************************************
"
report-type
(lisp-implementation-type)
(lisp-implementation-version)
(machine-type)
+ db-name
db-type
(if (not (eq db-type *test-database-underlying-type*))
(format nil " with underlying type ~:@(~A~)"
(multiple-value-bind (test-forms skip-tests)
(compute-tests-for-backend db-type *test-database-underlying-type*)
- (write-report-banner "Test Suite" db-type *report-stream*)
+ (write-report-banner "Test Suite" db-type *report-stream*
+ (database-name-from-spec spec db-type))
; (test-initialise-database)
(if skip-tests
(dolist (skipped skip-tests)
(format *report-stream*
- "~& ~20A ~A~%" (car skipped) (cdr skipped)))
+ "~& ~30A ~A~%" (car skipped) (cdr skipped)))
(format *report-stream* " None~%")))
(disconnect)))
(push (cons test "syntax not supported.") skip-tests))
((and (eq *test-database-type* :odbc)
(eq *test-database-underlying-type* :postgresql)
- (clsql-sys:in test :fddl/owner/1))
- (push (cons test "table ownership not supported by postgresql odbc driver.") skip-tests))
+ (clsql-sys:in test :fddl/owner/1 :fddl/owner/table
+ :fddl/owner/attributes
+ :fddl/owner/attribute-types
+ :fddl/owner/index
+ :fddl/owner/sequence))
+ (push (cons test "table ownership not supported by postgresql odbc driver.") skip-tests))
((and (not (member *test-database-underlying-type*
'(:postgresql :oracle)))
- (clsql-sys:in test :fddl/owner/1))
- (push (cons test "table ownership not supported.") skip-tests))
+ (clsql-sys:in test :fddl/owner/1 :fddl/owner/table
+ :fddl/owner/attributes
+ :fddl/owner/attribute-types
+ :fddl/owner/index
+ :fddl/owner/sequence))
+ (push (cons test "table ownership not supported.") skip-tests))
((and (null (clsql-sys:db-type-has-intersect? db-underlying-type))
(clsql-sys:in test :fdml/query/7))
(push (cons test "intersect not supported.") skip-tests))
:oodml/update-instance/4 :oodml/update-instance/5
:oodml/update-instance/6 :oodml/update-instance/7
:oodml/db-auto-sync/3 :oodml/db-auto-sync/4))
- (push (cons test ":auto-increment not supported.") skbip-tests))
+ (push (cons test ":auto-increment not supported.") skip-tests))
(t
(push test-form test-forms)))))
(values (nreverse test-forms) (nreverse skip-tests))))