r9199: fold clsql-base and clsql-base-sys into clsql-base

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

diff --git a/tests/test-init.lisp b/tests/test-init.lisp
index d8eec640021ee61281e5b42515caa4bb0e4db717..c13f545a0452eec526df868c51b2bdcd4b131ba2 100644 (file)
--- a/tests/test-init.lisp
+++ b/tests/test-init.lisp
@@ -401,23 +401,23 @@
       (let ((test (second test-form)))
        (cond
          ((and (null (db-type-has-views? db-underlying-type))
       (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))
           (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))
           (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*))
           (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))
           (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)
           (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)))))
           (push (cons test "not supported by sqlite") skip-tests))
          (t
           (push test-form test-forms)))))