X-Git-Url: http://git.kpe.io/?p=clsql.git;a=blobdiff_plain;f=tests%2Ftest-init.lisp;h=10caf4c16bbb366b654340c35a3e009d75fad1a0;hp=da6063337677cdb49bb2cbce91b7bdacb0a721c5;hb=8a8ee2d7d791b7a3efaed06420802a925d16fca3;hpb=967266c94b00f91e5967b8330fe2b9134b0c0447 diff --git a/tests/test-init.lisp b/tests/test-init.lisp index da60633..10caf4c 100644 --- a/tests/test-init.lisp +++ b/tests/test-init.lisp @@ -16,7 +16,7 @@ (in-package #:clsql-tests) -(defvar *report-stream* nil "Stream to send text report.") +(defvar *report-stream* *standard-output* "Stream to send text report.") (defvar *sexp-report-stream* nil "Stream to send sexp report.") (defvar *rt-connection*) (defvar *rt-fddl*) @@ -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: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,37 +63,45 @@ (email :accessor employee-email :type (string 100) - :nulls-ok t :initarg :email) - (companyid - :type integer) + (ecompanyid + :type integer + :initarg :companyid) (company :accessor employee-company :db-kind :join :db-info (:join-class company - :home-key companyid + :home-key ecompanyid :foreign-key companyid :set nil)) (managerid :type integer - :nulls-ok t) + :initarg :managerid) (manager :accessor employee-manager :db-kind :join :db-info (:join-class employee :home-key managerid :foreign-key emplid - :set nil))) + :set nil)) + (addresses + :accessor employee-addresses + :db-kind :join + :db-info (:join-class employee-address + :home-key emplid + :foreign-key aemplid + :target-slot address + :set t))) (:base-table employee)) (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) @@ -103,7 +109,8 @@ :type (string 100) :initarg :name) (presidentid - :type integer) + :type integer + :initarg :presidentid) (president :reader president :db-kind :join @@ -116,14 +123,48 @@ :db-kind :join :db-info (:join-class employee :home-key (companyid groupid) - :foreign-key (companyid groupid) - :set t))) - (:base-table company)) + :foreign-key (ecompanyid groupid) + :set t)))) +(def-view-class address () + ((addressid + :db-kind :key + :db-constraints :not-null + :type integer + :initarg :addressid) + (street-number + :type integer + :initarg :street-number) + (street-name + :type (string 30) + :void-value "" + :initarg :street-name) + (city + :column "city_field" + :void-value "no city" + :type (string 30) + :initarg :city) + (postal-code + :column zip + :type integer + :void-value 0 + :initarg :postal-code)) + (:base-table addr)) +;; many employees can reside at many addressess +(def-view-class employee-address () + ((aemplid :type integer :initarg :emplid) + (aaddressid :type integer :initarg :addressid) + (verified :type boolean :initarg :verified) + (address :db-kind :join + :db-info (:join-class address + :home-key aaddressid + :foreign-key addressid + :retrieval :immediate))) + (:base-table "ea_join")) (defun test-connect-to-database (db-type spec) - (when (db-backend-has-create/destroy-db? db-type) + (when (clsql-sys:db-backend-has-create/destroy-db? db-type) (ignore-errors (destroy-database spec :database-type db-type)) (ignore-errors (create-database spec :database-type db-type))) @@ -137,8 +178,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*)) @@ -156,113 +197,174 @@ (defparameter employee8 nil) (defparameter employee9 nil) (defparameter employee10 nil) +(defparameter address1 nil) +(defparameter address2 nil) +(defparameter employee-address1 nil) +(defparameter employee-address2 nil) +(defparameter employee-address3 nil) +(defparameter employee-address4 nil) +(defparameter employee-address5 nil) (defun test-initialise-database () (test-basic-initialize) - (clsql:create-view-from-class 'employee) - (clsql:create-view-from-class 'company) - - (setf company1 (make-instance 'company - :companyid 1 - :groupid 1 - :name "Widgets Inc.") - employee1 (make-instance 'employee - :emplid 1 - :groupid 1 - :married t - :height (1+ (random 1.00)) - :birthday (clsql-base:get-time) - :first-name "Vladamir" - :last-name "Lenin" - :email "lenin@soviet.org") - employee2 (make-instance 'employee - :emplid 2 - :groupid 1 - :height (1+ (random 1.00)) - :married t - :birthday (clsql-base:get-time) - :first-name "Josef" - :last-name "Stalin" - :email "stalin@soviet.org") - employee3 (make-instance 'employee - :emplid 3 - :groupid 1 - :height (1+ (random 1.00)) - :married t - :birthday (clsql-base:get-time) - :first-name "Leon" - :last-name "Trotsky" - :email "trotsky@soviet.org") - employee4 (make-instance 'employee - :emplid 4 - :groupid 1 - :height (1+ (random 1.00)) - :married nil - :birthday (clsql-base:get-time) - :first-name "Nikita" - :last-name "Kruschev" - :email "kruschev@soviet.org") - - employee5 (make-instance 'employee - :emplid 5 - :groupid 1 - :married nil - :height (1+ (random 1.00)) - :birthday (clsql-base:get-time) - :first-name "Leonid" - :last-name "Brezhnev" - :email "brezhnev@soviet.org") - - employee6 (make-instance 'employee - :emplid 6 - :groupid 1 - :married nil - :height (1+ (random 1.00)) - :birthday (clsql-base:get-time) - :first-name "Yuri" - :last-name "Andropov" - :email "andropov@soviet.org") - employee7 (make-instance 'employee - :emplid 7 - :groupid 1 - :height (1+ (random 1.00)) - :married nil - :birthday (clsql-base:get-time) - :first-name "Konstantin" - :last-name "Chernenko" - :email "chernenko@soviet.org") - employee8 (make-instance 'employee - :emplid 8 - :groupid 1 - :height (1+ (random 1.00)) - :married nil - :birthday (clsql-base:get-time) - :first-name "Mikhail" - :last-name "Gorbachev" - :email "gorbachev@soviet.org") - employee9 (make-instance 'employee - :emplid 9 - :groupid 1 - :married nil - :height (1+ (random 1.00)) - :birthday (clsql-base:get-time) - :first-name "Boris" - :last-name "Yeltsin" - :email "yeltsin@soviet.org") - employee10 (make-instance 'employee - :emplid 10 - :groupid 1 - :married nil - :height (1+ (random 1.00)) - :birthday (clsql-base:get-time) - :first-name "Vladamir" - :last-name "Putin" - :email "putin@soviet.org")) + (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) + (clsql:create-view-from-class 'address) + (clsql:create-view-from-class 'employee-address)) + (let ((*db-auto-sync* t)) + (setf company1 (make-instance 'company + :presidentid 1 + :companyid 1 + :groupid 1 + :name "Widgets Inc.") + employee1 (make-instance 'employee + :emplid 1 + :groupid 1 + :married t + :height (1+ (random 1.00)) + :birthday (clsql:get-time) + :first-name "Vladamir" + :last-name "Lenin" + :email "lenin@soviet.org" + :companyid 1) + employee2 (make-instance 'employee + :emplid 2 + :groupid 1 + :height (1+ (random 1.00)) + :married t + :birthday (clsql:get-time) + :first-name "Josef" + :last-name "Stalin" + :email "stalin@soviet.org" + :managerid 1 + :companyid 1) + employee3 (make-instance 'employee + :emplid 3 + :groupid 1 + :height (1+ (random 1.00)) + :married t + :birthday (clsql:get-time) + :first-name "Leon" + :last-name "Trotsky" + :email "trotsky@soviet.org" + :managerid 1 + :companyid 1) + employee4 (make-instance 'employee + :emplid 4 + :groupid 1 + :height (1+ (random 1.00)) + :married nil + :birthday (clsql:get-time) + :first-name "Nikita" + :last-name "Kruschev" + :email "kruschev@soviet.org" + :managerid 1 + :companyid 1) + employee5 (make-instance 'employee + :emplid 5 + :groupid 1 + :married nil + :height (1+ (random 1.00)) + :birthday (clsql:get-time) + :first-name "Leonid" + :last-name "Brezhnev" + :email "brezhnev@soviet.org" + :managerid 1 + :companyid 1) + employee6 (make-instance 'employee + :emplid 6 + :groupid 1 + :married nil + :height (1+ (random 1.00)) + :birthday (clsql:get-time) + :first-name "Yuri" + :last-name "Andropov" + :email "andropov@soviet.org" + :managerid 1 + :companyid 1) + employee7 (make-instance 'employee + :emplid 7 + :groupid 1 + :height (1+ (random 1.00)) + :married nil + :birthday (clsql:get-time) + :first-name "Konstantin" + :last-name "Chernenko" + :email "chernenko@soviet.org" + :managerid 1 + :companyid 1) + employee8 (make-instance 'employee + :emplid 8 + :groupid 1 + :height (1+ (random 1.00)) + :married nil + :birthday (clsql:get-time) + :first-name "Mikhail" + :last-name "Gorbachev" + :email "gorbachev@soviet.org" + :managerid 1 + :companyid 1) + employee9 (make-instance 'employee + :emplid 9 + :groupid 1 + :married nil + :height (1+ (random 1.00)) + :birthday (clsql:get-time) + :first-name "Boris" + :last-name "Yeltsin" + :email "yeltsin@soviet.org" + :managerid 1 + :companyid 1) + employee10 (make-instance 'employee + :emplid 10 + :groupid 1 + :married nil + :height (1+ (random 1.00)) + :birthday (clsql:get-time) + :first-name "Vladamir" + :last-name "Putin" + :email "putin@soviet.org" + :managerid 1 + :companyid 1) + address1 (make-instance 'address + :addressid 1 + :street-number 10 + :street-name "Park Place" + :city "Leningrad" + :postal-code 123) + address2 (make-instance 'address + :addressid 2) + employee-address1 (make-instance 'employee-address + :emplid 1 + :addressid 1 + :verified t) + employee-address2 (make-instance 'employee-address + :emplid 2 + :addressid 2 + :verified t) + employee-address3 (make-instance 'employee-address + :emplid 3 + :addressid 1 + :verified nil) + employee-address4 (make-instance 'employee-address + :emplid 1 + :addressid 2 + :verified nil) + employee-address5 (make-instance 'employee-address + :emplid 3 + :addressid 2) + )) + ;; sleep to ensure birthdays are no longer at current time - (sleep 2) - + (sleep 1) + + #|| ;; Lenin manages everyone (clsql:add-to-relation employee2 'manager employee1) (clsql:add-to-relation employee3 'manager employee1) @@ -286,7 +388,10 @@ (clsql:add-to-relation company1 'employees employee10) ;; Lenin is president of Widgets Inc. (clsql:add-to-relation company1 'president employee1) - ;; store these instances + ||# + + ;; store these instances + #|| (clsql:update-records-from-instance employee1) (clsql:update-records-from-instance employee2) (clsql:update-records-from-instance employee3) @@ -297,25 +402,33 @@ (clsql:update-records-from-instance employee8) (clsql:update-records-from-instance employee9) (clsql:update-records-from-instance employee10) - (clsql:update-records-from-instance company1)) + (clsql:update-records-from-instance company1) + (clsql:update-records-from-instance address1) + (clsql:update-records-from-instance address2) + ||# + ) (defvar *error-count* 0) (defvar *error-list* nil) -(defun run-tests-append-report-file (report-file) - (let* ((report-path (etypecase report-file +(defun run-function-append-report-file (function report-file) + (let* ((report-path (etypecase report-file (pathname report-file) (string (parse-namestring report-file)))) (sexp-report-path (make-pathname :defaults report-path :type "sexp"))) - (with-open-file (rs report-path :direction :output - :if-exists :append + (with-open-file (rs report-path :direction :output + :if-exists :append :if-does-not-exist :create) - (with-open-file (srs sexp-report-path :direction :output - :if-exists :append - :if-does-not-exist :create) - (run-tests :report-stream rs :sexp-report-stream srs))))) - + (with-open-file (srs sexp-report-path :direction :output + :if-exists :append + :if-does-not-exist :create) + (funcall function :report-stream rs :sexp-report-stream srs))))) + +(defun run-tests-append-report-file (report-file) + (run-function-append-report-file 'run-tests report-file)) + + (defun run-tests (&key (report-stream *standard-output*) (sexp-report-stream nil)) (let ((specs (read-specs)) (*report-stream* report-stream) @@ -334,52 +447,56 @@ (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-sys:initialize-database-type :database-type db-type)))) -(defun do-tests-for-backend (db-type spec) - (test-connect-to-database db-type spec) - - (unwind-protect - (multiple-value-bind (test-forms skip-tests) - (compute-tests-for-backend db-type *test-database-underlying-type*) - - (format *report-stream* - "~& +(defun write-report-banner (report-type db-type stream) + (format stream + "~& ****************************************************************************** -*** CLSQL Test Suite begun at ~A +*** CLSQL ~A begun at ~A *** ~A *** ~A on ~A *** Database ~A backend~A. ****************************************************************************** -" - (clsql-base:format-time - nil - (clsql-base:utime->time (get-universal-time))) - (lisp-implementation-type) - (lisp-implementation-version) - (machine-type) - db-type - (if (not (eq db-type *test-database-underlying-type*)) - (format nil " with underlying type ~A" - *test-database-underlying-type*) - "") - ) - +" + report-type + (clsql:format-time + nil + (clsql:utime->time (get-universal-time))) + (lisp-implementation-type) + (lisp-implementation-version) + (machine-type) + db-type + (if (not (eq db-type *test-database-underlying-type*)) + (format nil " with underlying type ~A" + *test-database-underlying-type*) + "") + )) + +(defun do-tests-for-backend (db-type spec) + (test-connect-to-database db-type spec) + + (unwind-protect + (multiple-value-bind (test-forms skip-tests) + (compute-tests-for-backend db-type *test-database-underlying-type*) + + (write-report-banner "Test Suite" db-type *report-stream*) + (test-initialise-database) (regression-test:rem-all-tests) (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)))) @@ -397,36 +514,55 @@ (defun compute-tests-for-backend (db-type db-underlying-type) + (declare (ignorable db-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)) + ((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)) - ((and (null (db-type-has-boolean-where? db-underlying-type)) - (clsql-base-sys::in test :fdml/select/11 :oodml/select/5)) + ((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)) - ((and (null (db-type-has-subqueries? db-underlying-type)) - (clsql-base-sys::in test :fdml/select/5 :fdml/select/10)) + ((and (null (clsql-sys:db-type-has-subqueries? db-underlying-type)) + (clsql-sys: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 + ((and (null (clsql-sys: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-sys: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)) + ((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)) ((and (eql *test-database-type* :sqlite) - (clsql-base-sys::in test :fddl/view/4 :fdml/select/10)) + (clsql-sys:in test :fddl/view/4 :fdml/select/10 + :fdml/select/21)) (push (cons test "not supported by sqlite") 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)) (t (push test-form test-forms))))) - (values (nreverse test-forms) (nreverse skip-tests)))) + (values (nreverse test-forms) (nreverse skip-tests)))) + + +(defun rapid-load (type) + "Rapid load for interactive testing." + (when *default-database* + (disconnect :database *default-database*)) + (test-connect-to-database type (car (db-type-spec type (read-specs)))) + (test-initialise-database)) + +(defun rl () + (rapid-load :postgresql)) + +(defun rlm () + (rapid-load :mysql)) +(defun rlo () + (rapid-load :odbc))