X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=tests%2Ftest-init.lisp;h=6b8ddedc5c04eb6abd0799a46fc3a1e5fc708254;hb=7cdc9aa48baa3c52923d61da6fa632eb47ac0b5d;hp=ca402ce88341e641c6a143c7c7634b9e2426f09c;hpb=813ae0f6f92e4b9dfac48528d64a6ae8b229d3a1;p=clsql.git diff --git a/tests/test-init.lisp b/tests/test-init.lisp index ca402ce..6b8dded 100644 --- a/tests/test-init.lisp +++ b/tests/test-init.lisp @@ -137,8 +137,8 @@ :make-default t :if-exists :old) - (unless (db-backend-has-create/destroy-db? db-type) - (truncate-database :database *default-database*)) + ;; Ensure database is empty + (truncate-database :database *default-database*) (setf *test-database-underlying-type* (clsql-sys:database-underlying-type *default-database*)) @@ -334,7 +334,7 @@ (defun load-necessary-systems (specs) (dolist (db-type +all-db-types+) (when (db-type-spec db-type specs) - (db-type-ensure-system db-type)))) + (clsql:initialize-database-type :database-type db-type)))) (defun do-tests-for-backend (db-type spec) (test-connect-to-database db-type spec) @@ -399,12 +399,9 @@ (defun compute-tests-for-backend (db-type db-underlying-type) (let ((test-forms '()) (skip-tests '())) - (dolist (test-form (append - (if (eq db-type :sqlite) - (test-basic-forms-untyped) - (test-basic-forms)) - *rt-connection* *rt-fddl* *rt-fdml* - *rt-ooddl* *rt-oodml* *rt-syntax*)) + (dolist (test-form (append (test-basic-forms) + *rt-connection* *rt-fddl* *rt-fdml* + *rt-ooddl* *rt-oodml* *rt-syntax*)) (let ((test (second test-form))) (cond ((and (null (db-type-has-views? db-underlying-type))