X-Git-Url: http://git.kpe.io/?p=clsql.git;a=blobdiff_plain;f=tests%2Ftest-oodml.lisp;h=0457499e7ccc256da7885cb816b30c7e0aed7fc8;hp=e1bb530c079b87d76930f44f4d0a59a7ca59af9a;hb=90896f2e0ea06af22bda925c71a7470cc1dda263;hpb=d9937e92697e07d701defd1fdcee7100d005fdf6 diff --git a/tests/test-oodml.lisp b/tests/test-oodml.lisp index e1bb530..0457499 100644 --- a/tests/test-oodml.lisp +++ b/tests/test-oodml.lisp @@ -50,11 +50,11 @@ " " (slot-value e 'last-name))) (clsql:select 'employee :where [= [slot-value 'employee 'first-name] - "Vladamir"] + "Vladimir"] :flatp t :order-by [last-name] :caching nil)) - ("Vladamir Lenin" "Vladamir Putin")) + ("Vladimir Lenin" "Vladimir Putin")) (deftest :oodml/select/5 (length (clsql:select 'employee :where [married] :flatp t :caching nil)) @@ -194,7 +194,7 @@ ": " (employee-email lenin)))) (progn - (setf (slot-value employee1 'first-name) "Vladamir" + (setf (slot-value employee1 'first-name) "Vladimir" (slot-value employee1 'last-name) "Lenin" (slot-value employee1 'email) "lenin@soviet.org") (clsql:update-records-from-instance employee1) @@ -209,9 +209,9 @@ (last-name lenin) ": " (employee-email lenin))))) - "Vladamir Lenin: lenin@soviet.org" + "Vladimir Lenin: lenin@soviet.org" "Dimitriy Ivanovich: ivanovich@soviet.org" - "Vladamir Lenin: lenin@soviet.org") + "Vladimir Lenin: lenin@soviet.org") ;; tests update-record-from-slot (deftest :oodml/update-records/2 @@ -270,7 +270,7 @@ ": " (employee-email lenin)))) (progn - (setf (slot-value employee1 'first-name) "Vladamir" + (setf (slot-value employee1 'first-name) "Vladimir" (slot-value employee1 'last-name) "Lenin" (slot-value employee1 'email) "lenin@soviet.org") (clsql:update-record-from-slots employee1 '(first-name last-name email)) @@ -285,9 +285,9 @@ (last-name lenin) ": " (employee-email lenin))))) - "Vladamir Lenin: lenin@soviet.org" + "Vladimir Lenin: lenin@soviet.org" "Dimitriy Ivanovich: ivanovich@soviet.org" - "Vladamir Lenin: lenin@soviet.org") + "Vladimir Lenin: lenin@soviet.org") ;; tests update-instance-from-records (deftest :oodml/update-instance/1 @@ -313,7 +313,7 @@ (slot-value employee1 'email))) (progn (clsql:update-records [employee] - :av-pairs '(([first-name] "Vladamir") + :av-pairs '(([first-name] "Vladimir") ([last-name] "Lenin") ([email] "lenin@soviet.org")) :where [= [emplid] 1]) @@ -324,9 +324,9 @@ (slot-value employee1 'last-name) ": " (slot-value employee1 'email)))) - "Vladamir Lenin: lenin@soviet.org" + "Vladimir Lenin: lenin@soviet.org" "Ivan Petrov: petrov@soviet.org" - "Vladamir Lenin: lenin@soviet.org") + "Vladimir Lenin: lenin@soviet.org") ;; tests update-slot-from-record (deftest :oodml/update-instance/2 @@ -454,6 +454,14 @@ (every #'(lambda (dea) (typep (slot-value dea 'address) 'address)) dea-list) (mapcar #'(lambda (dea) (slot-value (slot-value dea 'address) 'addressid)) dea-list)))) t t t t (1 1 2 2 2)) + + (deftest :oodml/uoj/2 + (progn + (clsql:update-objects-joins (list company1)) + (mapcar #'(lambda (e) + (slot-value e 'ecompanyid)) + (company-employees company1))) + (1 1 1 1 1 1 1 1 1 1)) (deftest :oodml/big/1 (let ((objs (clsql:select 'big :order-by [i] :flatp t))) @@ -526,13 +534,14 @@ (progn (setf (slot-value emp1 'height) 1.0E0) (clsql:update-record-from-slot emp1 'height) - (car (clsql:select [height] :from [employee] - :where [= [emplid] 1] - :flatp t - :field-names nil))) + (= (car (clsql:select [height] :from [employee] + :where [= [emplid] 1] + :flatp t + :field-names nil)) + 1)) (setf (slot-value emp1 'height) height) (clsql:update-record-from-slot emp1 'height))) - 1.0d0) + t) (deftest :oodml/float/2 (let* ((emp1 (car (select 'employee @@ -545,13 +554,14 @@ (progn (setf (slot-value emp1 'height) 1.0S0) (clsql:update-record-from-slot emp1 'height) - (car (clsql:select [height] :from [employee] - :where [= [emplid] 1] - :flatp t - :field-names nil))) + (= (car (clsql:select [height] :from [employee] + :where [= [emplid] 1] + :flatp t + :field-names nil)) + 1)) (setf (slot-value emp1 'height) height) (clsql:update-record-from-slot emp1 'height))) - 1.0d0) + t) (deftest :oodml/float/3 (let* ((emp1 (car (select 'employee @@ -564,13 +574,14 @@ (progn (setf (slot-value emp1 'height) 1.0F0) (clsql:update-record-from-slot emp1 'height) - (car (clsql:select [height] :from [employee] - :where [= [emplid] 1] - :flatp t - :field-names nil))) + (= (car (clsql:select [height] :from [employee] + :where [= [emplid] 1] + :flatp t + :field-names nil)) + 1)) (setf (slot-value emp1 'height) height) (clsql:update-record-from-slot emp1 'height))) - 1.0d0) + t) (deftest :oodml/float/4 (let* ((emp1 (car (select 'employee @@ -583,13 +594,14 @@ (progn (setf (slot-value emp1 'height) 1.0D0) (clsql:update-record-from-slot emp1 'height) - (car (clsql:select [height] :from [employee] - :where [= [emplid] 1] - :flatp t - :field-names nil))) + (= (car (clsql:select [height] :from [employee] + :where [= [emplid] 1] + :flatp t + :field-names nil)) + 1)) (setf (slot-value emp1 'height) height) (clsql:update-record-from-slot emp1 'height))) - 1.0d0) + t) (deftest :oodml/float/5 (let* ((emp1 (car (select 'employee @@ -602,13 +614,14 @@ (progn (setf (slot-value emp1 'height) 1.0L0) (clsql:update-record-from-slot emp1 'height) - (car (clsql:select [height] :from [employee] - :where [= [emplid] 1] - :flatp t - :field-names nil))) + (= (car (clsql:select [height] :from [employee] + :where [= [emplid] 1] + :flatp t + :field-names nil)) + 1)) (setf (slot-value emp1 'height) height) (clsql:update-record-from-slot emp1 'height))) - 1.0d0) + t) ))