X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=tests%2Ftest-init.lisp;h=eef4f888c44009906ae2c074951702cf83c3dfe9;hb=1dda729b250779079efbdc1d3f6bbb3ae4a20ba4;hp=da6063337677cdb49bb2cbce91b7bdacb0a721c5;hpb=967266c94b00f91e5967b8330fe2b9134b0c0447;p=clsql.git

diff --git a/tests/test-init.lisp b/tests/test-init.lisp
index da60633..eef4f88 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)
@@ -137,8 +133,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*))
@@ -160,8 +156,12 @@
 (defun test-initialise-database ()
   (test-basic-initialize)
   
-  (clsql:create-view-from-class 'employee)
-  (clsql:create-view-from-class 'company)
+  (let ((*backend-warning-behavior*
+	 (if (member *test-database-type* '(:postgresql :postgresql-socket))
+	     :ignore
+	   :warn)))
+    (clsql:create-view-from-class 'employee)
+    (clsql:create-view-from-class 'company))
 
   (setf company1 (make-instance 'company
 		   :companyid 1
@@ -259,7 +259,7 @@
 		     :first-name "Vladamir"
 		     :last-name "Putin"
 		     :email "putin@soviet.org"))
-
+  
   ;; sleep to ensure birthdays are no longer at current time
   (sleep 2) 
 
@@ -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)
@@ -371,15 +371,15 @@
 	(dolist (test-form test-forms)
 	  (eval test-form))
 	
-	(let ((remaining (rtest:do-tests *report-stream*)))
-	  (when (rt:pending-tests)
+	(let ((remaining (regression-test:do-tests *report-stream*)))
+	  (when (regression-test:pending-tests)
 	    (incf *error-count* (length remaining))))
 	
 	(let ((sexp-error (list db-type 
 				*test-database-underlying-type* 
 				(get-universal-time)
 				(length test-forms)
-				(rt:pending-tests)
+				(regression-test:pending-tests)
 				(lisp-implementation-type) 
 				(lisp-implementation-version)
 				(machine-type))))
@@ -399,32 +399,29 @@
 (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))
-		(clsql-base-sys::in test :fddl/view/1 :fddl/view/2 :fddl/view/3 :fddl/view/4))
+		(clsql-base::in test :fddl/view/1 :fddl/view/2 :fddl/view/3 :fddl/view/4))
 	   (push (cons test "views not supported") skip-tests))
 	  ((and (null (db-type-has-boolean-where? db-underlying-type))
-		(clsql-base-sys::in test :fdml/select/11 :oodml/select/5))
+		(clsql-base::in test :fdml/select/11 :oodml/select/5))
 	   (push (cons test "boolean where not supported") skip-tests))
 	  ((and (null (db-type-has-subqueries? db-underlying-type))
-		(clsql-base-sys::in test :fdml/select/5 :fdml/select/10))
+		(clsql-base::in test :fdml/select/5 :fdml/select/10))
 	   (push (cons test "subqueries not supported") skip-tests))
 	  ((and (null (db-type-transaction-capable? db-underlying-type
 						    *default-database*))
-		(clsql-base-sys::in test :fdml/transaction/1 :fdml/transaction/2 :fdml/transaction/3 :fdml/transaction/4))
+		(clsql-base::in test :fdml/transaction/1 :fdml/transaction/2 :fdml/transaction/3 :fdml/transaction/4))
 	   (push (cons test "transactions not supported") skip-tests))
 	  ((and (null (db-type-has-fancy-math? db-underlying-type))
-		(clsql-base-sys::in test :fdml/select/1))
+		(clsql-base::in test :fdml/select/1))
 	   (push (cons test "fancy math not supported") skip-tests))
 	  ((and (eql *test-database-type* :sqlite)
-		(clsql-base-sys::in test :fddl/view/4 :fdml/select/10))
+		(clsql-base::in test :fddl/view/4 :fdml/select/10))
 	   (push (cons test "not supported by sqlite") skip-tests))
 	  (t
 	   (push test-form test-forms)))))