X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=tests%2Ftest-oodml.lisp;h=804248bcb09ff262a94145124a828c2e16cd1df5;hb=1c5166f0e106b086a5f50a7ce5af2f50d6c6b58e;hp=84046fcdd20167045e0c5d411cbde4ec8356f8ac;hpb=ec9b352b8205e4204a06797f98970b03cf532ab2;p=clsql.git

diff --git a/tests/test-oodml.lisp b/tests/test-oodml.lisp
index 84046fc..804248b 100644
--- a/tests/test-oodml.lisp
+++ b/tests/test-oodml.lisp
@@ -59,15 +59,7 @@
   3)
 
 (deftest :oodml/select/6
-    (slot-value (caar (clsql:select 'employee :where [= 1 [emplid]])) 'married)
-  t)
-
-(deftest :oodml/select/7
-    (slot-value (caar (clsql:select 'employee :where [= 4 [emplid]])) 'married)
-  nil)
-
-(deftest :oodml/select/8
-    (let ((a (caar (clsql:select 'address :where [= 1 [emplid]]))))
+    (let ((a (caar (clsql:select 'address :where [= 1 [addressid]]))))
       (values
        (slot-value a 'street-number)
        (slot-value a 'street-name)
@@ -75,8 +67,8 @@
        (slot-value a 'postal-code)))
   10 "Park Place" "Leningrad" 123)
 
-(deftest :oodml/select/9
-    (let ((a (caar (clsql:select 'address :where [= 2 [emplid]]))))
+(deftest :oodml/select/7
+    (let ((a (caar (clsql:select 'address :where [= 2 [addressid]]))))
       (values
        (slot-value a 'street-number)
        (slot-value a 'street-name)
@@ -84,6 +76,32 @@
        (slot-value a 'postal-code)))
   nil "" "no city" 0)
 
+(deftest :oodml/select/8 
+    (mapcar #'(lambda (e) (slot-value e 'married)) 
+              (clsql:select 'employee :flatp t :order-by [emplid]))
+  (t t t nil nil nil nil nil nil nil))
+
+(deftest :oodml/select/9
+    (mapcar #'(lambda (pair)
+		(list
+		 (typep (car pair) 'address)
+		 (typep (second pair) 'employee-address)
+		 (slot-value (car pair) 'addressid)
+		 (slot-value (second pair) 'addressid)))
+     (employee-addresses employee1))
+  ((t t 1 1) (t t 2 2)))
+
+(deftest :oodml/select/10
+    (mapcar #'(lambda (pair)
+		(list
+		 (typep (car pair) 'address)
+		 (typep (second pair) 'employee-address)
+		 (slot-value (car pair) 'addressid)
+		 (slot-value (second pair) 'addressid)))
+     (employee-addresses employee2))
+  ((t t 2 2)))
+
+
 ;; tests update-records-from-instance 
 (deftest :oodml/update-records/1
     (values
@@ -290,11 +308,11 @@
                                            "Lenin"]])
  (("Lenin" "Widgets Inc.")))
 
-;(deftest :oodml/iteration/3
-;    (loop for (e) being the tuples in 
-;          [select 'employee :where [married] :order-by [emplid]]
-;          collect (slot-value e 'last-name))
-;  ("Lenin" "Stalin" "Trotsky"))
+(deftest :oodml/iteration/3
+    (loop for (e) being the records in 
+          [select 'employee :where [< [emplid] 4] :order-by [emplid]]
+	collect (slot-value e 'last-name))
+  ("Lenin" "Stalin" "Trotsky"))
 
 ))