X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=tests%2Ftest-oodml.lisp;h=7e69d6e3c51b84b30f60fdd36de15ffe3fe72f6f;hb=9f88a2a19d13afb9ab7f35ad1df522d00301b56d;hp=e30e396a130d38435195d1bf0806197cb21fc18e;hpb=49db0a8a6a6cde1581d5de0dd3c6822fd505472b;p=clsql.git

diff --git a/tests/test-oodml.lisp b/tests/test-oodml.lisp
index e30e396..7e69d6e 100644
--- a/tests/test-oodml.lisp
+++ b/tests/test-oodml.lisp
@@ -59,7 +59,7 @@
   3)
 
 (deftest :oodml/select/6
-    (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)
@@ -68,7 +68,7 @@
   10 "Park Place" "Leningrad" 123)
 
 (deftest :oodml/select/7
-    (let ((a (caar (clsql:select 'address :where [= 2 [emplid]]))))
+    (let ((a (caar (clsql:select 'address :where [= 2 [addressid]]))))
       (values
        (slot-value a 'street-number)
        (slot-value a 'street-name)
@@ -81,6 +81,27 @@
               (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 (cdr pair) 'employee-address)
+		 (slot-value (car pair) 'addressid)
+		 (slot-value (cdr 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 (cdr pair) 'employee-address)
+		 (slot-value (car pair) 'addressid)
+		 (slot-value (cdr pair) 'addressid)))
+     (employee-addresses employee2))
+  ((t t 2 2)))
+
+
 ;; tests update-records-from-instance 
 (deftest :oodml/update-records/1
     (values
@@ -287,13 +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))
+    (loop for (e) being the records in 
+          [select 'employee :where [< [emplid] 4] :order-by [emplid]]
+	collect (slot-value e 'last-name))
   ("Lenin" "Stalin" "Trotsky"))
-||#
 
 ))