X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=tests%2Ftest-init.lisp;h=b554625387ef557edc4a8376b5bfb877ba797f9f;hb=d9b32644383f3c4087d0ecac10c645f38d17648d;hp=d98cbf226e4e2ce2490202b7ba0f559b6c8ac5fc;hpb=8ee8fd019f504602519a38b78db018b5c1ec1e25;p=clsql.git

diff --git a/tests/test-init.lisp b/tests/test-init.lisp
index d98cbf2..b554625 100644
--- a/tests/test-init.lisp
+++ b/tests/test-init.lisp
@@ -171,7 +171,8 @@
 	    :db-info (:join-class address
 				  :home-key aaddressid
 				  :foreign-key addressid
-				  :retrieval :deferred)))
+				  :retrieval :deferred
+				  :set nil)))
   (:base-table "ea_join"))
 
 (defun test-connect-to-database (db-type spec)
@@ -540,7 +541,8 @@
 		(clsql-sys:in test :fdml/select/11 :oodml/select/5))
 	   (push (cons test "boolean where not supported") skip-tests))
 	  ((and (null (clsql-sys:db-type-has-subqueries? db-underlying-type))
-		(clsql-sys:in test :fdml/select/5 :fdml/select/10))
+		(clsql-sys:in test :fdml/select/5 :fdml/select/10
+                              :fdml/select/32 :fdml/select/33))
 	   (push (cons test "subqueries not supported") skip-tests))
 	  ((and (null (clsql-sys:db-type-transaction-capable? db-underlying-type
 						    *default-database*))
@@ -551,12 +553,19 @@
 	   (push (cons test "fancy math not supported") skip-tests))
 	  ((and (eql *test-database-type* :sqlite)
 		(clsql-sys:in test :fddl/view/4 :fdml/select/10
-				:fdml/select/21))
+				:fdml/select/21 :fdml/select/32 
+                                :fdml/select/33))
 	   (push (cons test "not supported by sqlite") skip-tests))
+	  ((and (eql *test-database-underlying-type* :mysql)
+		(clsql-sys:in test :fdml/select/26))
+	   (push (cons test "string table aliases not supported") skip-tests))
 	  ((and (eql *test-database-underlying-type* :mysql)
 		(clsql-sys:in test :fdml/select/22 :fdml/query/5 
 				:fdml/query/7 :fdml/query/8))
 	   (push (cons test "not supported by mysql") skip-tests))
+	  ((and (null (clsql-sys:db-type-has-union? db-underlying-type))
+		(clsql-sys:in test :fdml/query/6 :fdml/select/31))
+	   (push (cons test "union not supported") skip-tests))
 	  (t
 	   (push test-form test-forms)))))
       (values (nreverse test-forms) (nreverse skip-tests))))