X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=tests%2Ftest-init.lisp;h=d8eec640021ee61281e5b42515caa4bb0e4db717;hb=80d94a5396eeaca850bb643390b836d8bd0825b3;hp=3e6d85a21a551b44d7f30f52399bf1f23ac6673f;hpb=f716bb1161cf9e89a96945c4a444244f9d303691;p=clsql.git

diff --git a/tests/test-init.lisp b/tests/test-init.lisp
index 3e6d85a..d8eec64 100644
--- a/tests/test-init.lisp
+++ b/tests/test-init.lisp
@@ -34,24 +34,22 @@
   ((extraterrestrial :initform nil :initarg :extraterrestrial)))
 
 (def-view-class person (thing)
-  ((height :db-kind :base :accessor height :type float :nulls-ok t
+  ((height :db-kind :base :accessor height :type float
            :initarg :height)
-   (married :db-kind :base :accessor married :type boolean :nulls-ok t
+   (married :db-kind :base :accessor married :type boolean
             :initarg :married)
-   (birthday :nulls-ok t :type clsql-base:wall-time :initarg :birthday)
+   (birthday :type clsql-base:wall-time :initarg :birthday)
    (hobby :db-kind :virtual :initarg :hobby :initform nil)))
   
 (def-view-class employee (person)
   ((emplid
     :db-kind :key
     :db-constraints :not-null
-    :nulls-ok nil
     :type integer
     :initarg :emplid)
    (groupid
     :db-kind :key
     :db-constraints :not-null
-    :nulls-ok nil
     :type integer
     :initarg :groupid)
    (first-name
@@ -65,7 +63,6 @@
    (email
     :accessor employee-email
     :type (string 100)
-    :nulls-ok t
     :initarg :email)
    (companyid
     :type integer)
@@ -77,8 +74,7 @@
 			  :foreign-key companyid
 			  :set nil))
    (managerid
-    :type integer
-    :nulls-ok t)
+    :type integer)
    (manager
     :accessor employee-manager
     :db-kind :join
@@ -90,12 +86,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)
@@ -399,12 +395,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))