r9192: fix :db-type to :db-kind

[clsql.git] / tests / test-init.lisp

diff --git a/tests/test-init.lisp b/tests/test-init.lisp
index edbb2eb2eca4d69b3c2b2d4c07b847b89b13619f..feee1d5ff328b9499ac31017536dfedc396bef28 100644 (file)
--- a/tests/test-init.lisp
+++ b/tests/test-init.lisp
@@ -90,12 +90,12 @@
 
 (def-view-class company ()
   ((companyid
-    :db-type :key
+    :db-kind :key
     :db-constraints :not-null
     :type integer
     :initarg :companyid)
    (groupid
-    :db-type :key
+    :db-kind :key
     :db-constraints :not-null
     :type integer
     :initarg :groupid)
@@ -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))