X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=tests%2Ftest-oodml.lisp;h=3cde0a75602354d67d57069324976e52f7221893;hb=a56b464f5cd084bb8cc493a150b49a6033f48143;hp=8d2281e6dded219eabdf92fdc742c123f216dec5;hpb=8ee8fd019f504602519a38b78db018b5c1ec1e25;p=clsql.git

diff --git a/tests/test-oodml.lisp b/tests/test-oodml.lisp
index 8d2281e..3cde0a7 100644
--- a/tests/test-oodml.lisp
+++ b/tests/test-oodml.lisp
@@ -105,6 +105,16 @@
 	     (employee-addresses employee2))
 	  ((t t 2 2 2)))
 
+        (deftest :oodml/select/11 
+         (values (mapcar #'(lambda (x) (slot-value x 'emplid))
+                         (clsql:select 'employee :order-by '(([emplid] :asc)) 
+                                       :flatp t))
+          (mapcar #'(lambda (x) (slot-value x 'emplid))
+                  (clsql:select 'employee :order-by '(([emplid] :desc)) 
+                                :flatp t)))
+         (1 2 3 4 5 6 7 8 9 10)
+         (10 9 8 7 6 5 4 3 2 1))
+
 	;; test retrieval is deferred
 	(deftest :oodm/retrieval/1
 	    (every #'(lambda (e) (not (slot-boundp e 'company)))
@@ -374,13 +384,75 @@
 	  ("Lenin" "Stalin" "Trotsky"))
 
 
-      (deftest oodml/cache/1
+      (deftest :oodml/cache/1
 	  (progn
 	    (setf (clsql-sys:record-caches *default-database*) nil)
 	    (let ((employees (select 'employee)))
 	      (every #'(lambda (a b) (eq a b))
 		     employees (select 'employee))))
 	t)
-			 
+
+	(deftest :oodml/cache/2
+	    (let ((employees (select 'employee)))
+	      (equal employees (select 'employee :flatp t)))
+	  nil)
+	
+	(deftest :oodml/refresh/1
+	    (let ((addresses (select 'address)))
+	      (equal addresses (select 'address :refresh t)))
+	  t)
+
+	(deftest :oodml/refresh/2
+	    (let* ((addresses (select 'address :order-by [addressid] :flatp t))
+		   (city (slot-value (car addresses) 'city)))
+	      (clsql:update-records [addr] 
+                              :av-pairs '((city_field "A new city"))
+                              :where [= [addressid] (slot-value (car addresses) 'addressid)])
+	      (let* ((new-addresses (select 'address :order-by [addressid] :refresh t :flatp t))
+		     (new-city (slot-value (car addresses) 'city))
+)
+		(clsql:update-records [addr] 
+				      :av-pairs `((city_field ,city))
+				      :where [= [addressid] (slot-value (car addresses) 'addressid)])
+		(values (equal addresses new-addresses)
+			city
+			new-city)))
+	  t "Leningrad" "A new city")
+	
+	(deftest :oodml/refresh/3
+	    (let* ((addresses (select 'address :order-by [addressid] :flatp t)))
+	      (values
+	       (equal addresses (select 'address :refresh t :flatp t))
+	       (equal addresses (select 'address :flatp t))))
+	  nil nil)
+	
+	(deftest :oodml/refresh/4
+	    (let* ((addresses (select 'address :order-by [addressid] :flatp t))
+		   (*db-auto-sync* t))
+	      (make-instance 'address :addressid 1000 :city "A new address city")
+	      (let ((new-addresses (select 'address :order-by [addressid] :flatp t :refresh t)))
+		(delete-records :from [addr] :where [= [addressid] 1000]) 
+		(values
+		 (length addresses)
+		 (length new-addresses)
+		 (eq (first addresses) (first new-addresses))
+		 (eq (second addresses) (second new-addresses)))))
+	  2 3 t t)
+		
+	      
+	(deftest :oodml/uoj/1
+	    (progn
+	      (let* ((dea-list (select 'deferred-employee-address :caching nil :order-by [ea_join aaddressid]
+				       :flatp t))
+		     (dea-list-copy (copy-seq dea-list))
+		     (initially-unbound (every #'(lambda (dea) (not (slot-boundp dea 'address))) dea-list)))
+		(update-object-joins dea-list)
+		(values
+		 initially-unbound
+		 (equal dea-list dea-list-copy)
+		 (every #'(lambda (dea) (slot-boundp dea 'address)) dea-list)
+		 (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))
 	))
 #.(clsql:restore-sql-reader-syntax-state)