X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=tests%2Ftest-init.lisp;h=5cdcb78115516fe16e53bea8497bb2bdba9a2879;hb=1b07d2fd927cf8f1943ac0a0b8c980d1dc707076;hp=ac294a7e68b3de8735e92c4b5911cfa85e5a929e;hpb=d0695ffb828519fade3aa5166236812e6144975b;p=clsql.git

diff --git a/tests/test-init.lisp b/tests/test-init.lisp
index ac294a7..5cdcb78 100644
--- a/tests/test-init.lisp
+++ b/tests/test-init.lisp
@@ -164,6 +164,11 @@
 	    :db-info (:join-class address
 				  :home-key aaddressid
 				  :foreign-key addressid
+				  :retrieval :immediate))
+   (employee :db-kind :join
+	     :db-info (:join-class employee
+				  :home-key aemplid
+				  :foreign-key emplid
 				  :retrieval :immediate)))
   (:base-table "ea_join"))
 
@@ -254,7 +259,7 @@
 				   :height (1+ (random 1.00))
 				   :bd-utime *test-start-utime*
 				   :birthday now-time
-				   :first-name "Vladamir"
+				   :first-name "Vladimir"
 				   :last-name "Lenin"
 				   :email "lenin@soviet.org"
 				   :companyid 1)
@@ -361,7 +366,7 @@
 				    :height (1+ (random 1.00))
 				    :bd-utime *test-start-utime*
 				    :birthday now-time
-				    :first-name "Vladamir"
+				    :first-name "Vladimir"
 				    :last-name "Putin"
 				    :email "putin@soviet.org"
 				    :managerid 1
@@ -579,6 +584,11 @@
 				:fdml/select/21 :fdml/select/32 
                                 :fdml/select/33))
 	   (push (cons test "not supported by sqlite") skip-tests))
+	  ((and (eql *test-database-type* :sqlite3)
+		(clsql-sys:in test :fddl/view/4 :fdml/select/10
+			      :fdml/select/21 :fdml/select/32 
+			      :fdml/select/33))
+	   (push (cons test "not supported by sqlite3") skip-tests))
 	  ((and (not (clsql-sys:db-type-has-bigint? db-type))
 		(clsql-sys:in test :basic/bigint/1))
 	   (push (cons test "bigint not supported") skip-tests))
@@ -593,17 +603,34 @@
 		(clsql-sys:in test :fdml/query/6 :fdml/select/31))
 	   (push (cons test "union not supported") skip-tests))
 	  ((and (eq *test-database-type* :oracle)
-		(clsql-sys:in test :fdml/query/8 :fdml/select/21))
+		(clsql-sys:in test :fdml/query/8 :fdml/select/21 
+                              :fddl/table/6))
 	   (push (cons test "syntax not supported") skip-tests))
-          ((and (not (member *test-database-underlying-type* 
+          ((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))
+	  ((and (not (member *test-database-underlying-type* 
                              '(:postgresql :oracle)))
-                (clsql-sys:in test :fddl/owner/1))
+		(clsql-sys:in test :fddl/owner/1))
            (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))
+          ((and (null (clsql-sys:db-type-has-except? db-underlying-type))
+		(clsql-sys:in test :fdml/query/8))
+	   (push (cons test "except not supported") skip-tests))
+          ((and (eq *test-database-underlying-type* :mssql)
+                (clsql-sys:in test :fdml/select/9))
+           (push (cons test "mssql uses integer math for AVG") skip-tests))
+          ((and (not (member *test-database-underlying-type* 
+                             '(:postgresql :mysql :sqlite3)))
+                (clsql-sys:in test :fdml/select/37 :fdml/select/38))
+           (push (cons test "LIMIT keyword not supported in SELECT") skip-tests))
 	  (t
 	   (push test-form test-forms)))))
       (values (nreverse test-forms) (nreverse skip-tests))))
 
-
 (defun rapid-load (type &optional (position 0))
   "Rapid load for interactive testing."
   (when *default-database*