X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;ds=sidebyside;f=tests%2Ftest-oodml.lisp;h=58de7289d77b8600b230e56b1275b1da6acca9f6;hb=d0695ffb828519fade3aa5166236812e6144975b;hp=1d8c6948ba807a91bb68bb7658465e9211e3d90b;hpb=3a3ccc7a171dc4c6c10bc7e3fea8461fca6dc51b;p=clsql.git

diff --git a/tests/test-oodml.lisp b/tests/test-oodml.lisp
index 1d8c694..58de728 100644
--- a/tests/test-oodml.lisp
+++ b/tests/test-oodml.lisp
@@ -154,7 +154,7 @@
 
 	(deftest :oodm/retrieval/8	    
 	    (mapcar #'(lambda (ea) (slot-value (slot-value ea 'address) 'street-number))
-	     (select 'employee-address :flatp t :order-by [ea_join aaddressid] :caching nil))
+	     (select 'employee-address :flatp t :order-by [aaddressid] :caching nil))
 	  (10 10 nil nil nil))
 
 	(deftest :oodm/retrieval/9
@@ -403,7 +403,7 @@
 	  t)
 
 	(deftest :oodml/refresh/2
-	    (let* ((addresses (select 'address :order-by [addressid] :flatp t))
+	    (let* ((addresses (select 'address :order-by [addressid] :flatp t :refresh t))
 		   (city (slot-value (car addresses) 'city)))
 	      (clsql:update-records [addr] 
                               :av-pairs '((city_field "A new city"))
@@ -427,7 +427,7 @@
 	  nil nil)
 	
 	(deftest :oodml/refresh/4
-	    (let* ((addresses (select 'address :order-by [addressid] :flatp t))
+	    (let* ((addresses (select 'address :order-by [addressid] :flatp t :refresh 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)))
@@ -446,7 +446,7 @@
 				       :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)
+		(update-objects-joins dea-list)
 		(values
 		 initially-unbound
 		 (equal dea-list dea-list-copy)
@@ -454,5 +454,67 @@
 		 (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/big/1 
+	    (let ((objs (clsql:select 'big :order-by [i] :flatp t)))
+	      (values
+	       (length objs)
+	       (do ((i 0 (1+ i))
+		    (max (expt 2 60))
+		    (rest objs (cdr rest)))
+		   ((= i (length objs)) t)
+		 (let ((obj (car rest))
+		       (index (1+ i)))
+		   (unless (and (eql (slot-value obj 'i) index)
+				(eql (slot-value obj 'bi) (truncate max index)))
+		     (print index)
+		     (describe obj)
+		     (return nil))))))
+	  555 t)
+
+        (deftest :oodml/db-auto-sync/1 
+            (values
+              (progn 
+                (make-instance 'employee :emplid 20 :groupid 1 
+                               :last-name "Ivanovich")
+                (select [last-name] :from [employee] :where [= [emplid] 20]
+                        :flatp t :field-names nil))
+             (let ((*db-auto-sync* t))
+               (make-instance 'employee :emplid 20 :groupid 1 
+                              :last-name "Ivanovich")
+               (prog1 (select [last-name] :from [employee] :flatp t
+                              :field-names nil 
+                              :where [= [emplid] 20])
+                 (delete-records :from [employee] :where [= [emplid] 20]))))
+          nil ("Ivanovich"))
+
+        (deftest :oodml/db-auto-sync/2
+            (values
+             (let ((instance (make-instance 'employee :emplid 20 :groupid 1 
+                                            :last-name "Ivanovich")))
+               (setf (slot-value instance 'last-name) "Bulgakov")
+               (select [last-name] :from [employee] :where [= [emplid] 20]
+                       :flatp t :field-names nil))
+             (let* ((*db-auto-sync* t)
+                    (instance (make-instance 'employee :emplid 20 :groupid 1 
+                                             :last-name "Ivanovich")))
+               (setf (slot-value instance 'last-name) "Bulgakov")
+               (prog1 (select [last-name] :from [employee] :flatp t
+                              :field-names nil 
+                              :where [= [emplid] 20])
+                 (delete-records :from [employee] :where [= [emplid] 20]))))
+          nil ("Bulgakov"))
+	
+        (deftest :oodml/setf-slot-value/1 
+            (let* ((*db-auto-sync* t)
+                   (instance (make-instance 'employee :emplid 20 :groupid 1)))
+              (prog1 
+                  (setf 
+                   (slot-value instance 'first-name) "Mikhail"
+                   (slot-value instance 'last-name) "Bulgakov")
+                (delete-records :from [employee] :where [= [emplid] 20])))
+          "Bulgakov")
+
 	))
+
 #.(clsql:restore-sql-reader-syntax-state)