X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=tests%2Ftest-init.lisp;h=7a46089b16b820e7fab2420dd393dff3d5fe8b3f;hb=799820388d21ad2d81502816025fdc6f89f71bf2;hp=8e1cc48569e3401bd5798acf4cc088015ee2d081;hpb=6d69ac764a6e285e5ee0cb0d46e24f652abd0f8f;p=clsql.git diff --git a/tests/test-init.lisp b/tests/test-init.lisp index 8e1cc48..7a46089 100644 --- a/tests/test-init.lisp +++ b/tests/test-init.lisp @@ -30,6 +30,8 @@ (defvar *test-database-type* nil) (defvar *test-database-underlying-type* nil) (defvar *test-database-user* nil) +(defvar *test-false-database-user* "adsfjalsdkfjlakjsdfl" + "For testing ownership, a user that isn't the owner.") (defvar *test-start-utime* nil) (defvar *test-connection-spec* nil) (defvar *test-connection-db-type* nil) @@ -44,7 +46,7 @@ (setf *test-database-type* db-type) (setf *test-database-user* (cond - ((eq :oracle db-type) (second spec)) + ((member db-type '(:oracle :odbc :aodbc)) (second spec)) ((>= (length spec) 3) (third spec)))) ;; Connect to the database @@ -169,7 +171,7 @@ (if skip-tests (dolist (skipped skip-tests) (format *report-stream* - "~& ~20A ~A~%" (car skipped) (cdr skipped))) + "~& ~30A ~A~%" (car skipped) (cdr skipped))) (format *report-stream* " None~%"))) (disconnect))) @@ -181,71 +183,82 @@ *rt-ooddl* *rt-oodml* *rt-syntax*)) (let ((test (second test-form))) (cond + ((and (not (eql db-underlying-type :mysql)) + (clsql-sys:in test :connection/query-command)) + (push (cons test "Known to only work in mysql as yet.") skip-tests)) ((and (null (clsql-sys:db-type-has-views? db-underlying-type)) (clsql-sys:in test :fddl/view/1 :fddl/view/2 :fddl/view/3 :fddl/view/4)) - (push (cons test "views not supported") skip-tests)) + (push (cons test "views not supported.") skip-tests)) ((and (null (clsql-sys:db-type-has-boolean-where? db-underlying-type)) (clsql-sys:in test :fdml/select/11 :oodml/select/5)) - (push (cons test "boolean where not supported") skip-tests)) + (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 :fdml/select/32 :fdml/select/33)) - (push (cons test "subqueries not supported") skip-tests)) + (push (cons test "subqueries not supported.") skip-tests)) ((and (null (clsql-sys:db-type-transaction-capable? db-underlying-type *default-database*)) (clsql-sys:in test :fdml/transaction/1 :fdml/transaction/2 :fdml/transaction/3 :fdml/transaction/4)) - (push (cons test "transactions not supported") skip-tests)) + (push (cons test "transactions not supported.") skip-tests)) ((and (null (clsql-sys:db-type-has-fancy-math? db-underlying-type)) (clsql-sys:in test :fdml/select/1)) - (push (cons test "fancy math not supported") skip-tests)) + (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/32 :fdml/select/33)) - (push (cons test "not supported by sqlite") skip-tests)) + (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)) + (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)) + (push (cons test "bigint not supported.") skip-tests)) ((and (eql *test-database-underlying-type* :mysql) (clsql-sys:in test :fdml/select/26)) - (push (cons test "string table aliases not supported on all mysql versions") skip-tests)) + (push (cons test "string table aliases not supported on all mysql versions.") 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)) + (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)) ((and (eq *test-database-type* :oracle) (clsql-sys:in test :fdml/query/8 :fdml/select/21 :fddl/table/6)) - (push (cons test "syntax not supported") skip-tests)) + (push (cons test "syntax not supported.") skip-tests)) ((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)) + (clsql-sys:in test :fddl/owner/1 :fddl/owner/table + :fddl/owner/attributes + :fddl/owner/attribute-types + :fddl/owner/index + :fddl/owner/sequence)) + (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)) - (push (cons test "table ownership not supported") skip-tests)) + (clsql-sys:in test :fddl/owner/1 :fddl/owner/table + :fddl/owner/attributes + :fddl/owner/attribute-types + :fddl/owner/index + :fddl/owner/sequence)) + (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)) + (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)) + (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)) + (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)) + (push (cons test "LIMIT keyword not supported in SELECT.") skip-tests)) ((and (not (clsql-sys:db-type-has-auto-increment? db-underlying-type)) (clsql-sys:in test :oodml/select/12 :oodml/select/13 :oodml/select/14 :oodml/select/15 :oodml/select/16 :oodml/select/17 @@ -259,7 +272,7 @@ :oodml/update-instance/4 :oodml/update-instance/5 :oodml/update-instance/6 :oodml/update-instance/7 :oodml/db-auto-sync/3 :oodml/db-auto-sync/4)) - (push (cons test ":auto-increment not by backend.") skip-tests)) + (push (cons test ":auto-increment not supported.") skip-tests)) (t (push test-form test-forms))))) (values (nreverse test-forms) (nreverse skip-tests))))