Changes to more broadly support auto-increment. new odbc-postgresql-database type

[clsql.git] / tests / test-oodml.lisp

diff --git a/tests/test-oodml.lisp b/tests/test-oodml.lisp
index f0d3d9b9e98baed6c1e9aaee674abb503d09dfe1..953a604a9adc693a657e2185c66ccab3ce37ecef 100644 (file)
--- a/tests/test-oodml.lisp
+++ b/tests/test-oodml.lisp
@@ -15,7 +15,8 @@
 
 (in-package #:clsql-tests)
 
-#.(clsql:locally-enable-sql-reader-syntax)
+(clsql-sys:file-enable-sql-reader-syntax)
+
 
 (setq *rt-oodml*
       '(
@@ -127,7 +128,7 @@
 ;; test retrieval of node, derived nodes etc
 (deftest :oodml/select/12
     (with-dataset *ds-nodes*
-      (length (clsql:select 'node :where [node-id] :flatp t :caching nil)))
+      (length (clsql:select 'node :where [not [null [node-id]]] :flatp t :caching nil)))
   11)
 
 (deftest :oodml/select/13
@@ -140,7 +141,7 @@
 
 (deftest :oodml/select/14
     (with-dataset *ds-nodes*
-      (length (clsql:select 'setting :where [setting-id] :flatp t :caching nil)))
+      (length (clsql:select 'setting :where [not [null [setting-id]]] :flatp t :caching nil)))
   4)
 
 (deftest :oodml/select/15
@@ -155,7 +156,7 @@
 
 (deftest :oodml/select/16
     (with-dataset *ds-nodes*
-      (length (clsql:select 'user :where [user-id] :flatp t :caching nil)))
+      (length (clsql:select 'user :where [not [null [user-id]]] :flatp t :caching nil)))
   2)
 
 (deftest :oodml/select/17
@@ -170,7 +171,7 @@
 
 (deftest :oodml/select/18
     (with-dataset *ds-nodes*
-      (length (clsql:select 'theme :where [theme-id] :flatp t :caching nil)))
+      (length (clsql:select 'theme :where [not [null [theme-id]]] :flatp t :caching nil)))
   2)
 
 (deftest :oodml/select/19
@@ -203,7 +204,7 @@
 
 (deftest :oodml/select/22
     (with-dataset *ds-nodes*
-      (let ((a (car (clsql:select 'subloc :where [subloc-id] :flatp t :caching nil))))
+      (let ((a (car (clsql:select 'subloc :where [not [null [subloc-id]]] :flatp t :caching nil))))
        (values
          (slot-value a 'node-id)
          (slot-value a 'subloc-id)
@@ -240,15 +241,15 @@
 
 (deftest :oodm/retrieval/4
     (with-dataset *ds-employees*
-      (mapcar #'(lambda (ea) (typep (slot-value ea 'address) 'address))
+      (every #'(lambda (ea) (typep (slot-value ea 'address) 'address))
              (select 'employee-address :flatp t :caching nil)))
-  (t t t t t))
+  t)
 
 (deftest :oodm/retrieval/5
     (with-dataset *ds-employees*
-      (mapcar #'(lambda (ea) (typep (slot-value ea 'address) 'address))
-             (select 'deferred-employee-address :flatp t :caching nil)))
-  (t t t t t))
+      (every #'(lambda (ea) (typep (slot-value ea 'address) 'address))
+             (select 'deferred-employee-address :flatp t :caching nil)))
+  t)
 
 (deftest :oodm/retrieval/6
     (with-dataset *ds-employees*
@@ -266,13 +267,13 @@
     (with-dataset *ds-employees*
       (mapcar #'(lambda (ea) (slot-value (slot-value ea 'address) 'street-number))
              (select 'employee-address :flatp t :order-by [aaddressid] :caching nil)))
-  (10 10 nil nil nil))
+  (10 10 nil nil nil nil))
 
 (deftest :oodm/retrieval/9
     (with-dataset *ds-employees*
       (mapcar #'(lambda (ea) (slot-value (slot-value ea 'address) 'street-number))
              (select 'deferred-employee-address :flatp t :order-by [aaddressid] :caching nil)))
-  (10 10 nil nil nil))
+  (10 10 nil nil nil nil))
 
 ;; tests update-records-from-instance
 (deftest :oodml/update-records/1
@@ -779,13 +780,13 @@
        (progn
          (clsql:update-records [node]
                                :av-pairs '(([title] "altered title"))
-                               :where [= [node-id] 9])
+                               :where [= [node-id] (node-id loc2)])
          (clsql:update-slot-from-record loc2 'title)
          (print-loc loc2))
        (progn
          (clsql:update-records [subloc]
                                :av-pairs '(([loc] "altered loc"))
-                               :where [= [subloc-id] 11])
+                               :where [= [subloc-id] (subloc-id subloc2)])
          (clsql:update-slot-from-record subloc2 'loc)
          (print-subloc subloc2)))))
   "9: location-2" "11: second subloc"
@@ -835,7 +836,7 @@
 
 (deftest :oodml/cache/1
     (with-dataset *ds-employees*
-      (progn
+      (let ((*default-caching* t))
        (setf (clsql-sys:record-caches *default-database*) nil)
        (let ((employees (select 'employee)))
          (every #'(lambda (a b) (eq a b))
@@ -844,19 +845,22 @@
 
 (deftest :oodml/cache/2
     (with-dataset *ds-employees*
-      (let ((employees (select 'employee)))
+      (let* ((*default-caching* t)
+             (employees (select 'employee)))
        (equal employees (select 'employee :flatp t))))
   nil)
 
 (deftest :oodml/refresh/1
     (with-dataset *ds-employees*
-      (let ((addresses (select 'address)))
+      (let* ((clsql-sys:*default-caching* t)
+             (addresses (select 'address)))
        (equal addresses (select 'address :refresh t))))
   t)
 
 (deftest :oodml/refresh/2
     (with-dataset *ds-employees*
-      (let* ((addresses (select 'address :order-by [addressid] :flatp t :refresh t))
+      (let* ((clsql-sys:*default-caching* t)
+             (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"))
@@ -874,7 +878,8 @@
 
 (deftest :oodml/refresh/3
     (with-dataset *ds-employees*
-      (let* ((addresses (select 'address :order-by [addressid] :flatp t)))
+      (let* ((clsql-sys:*default-caching* t)
+             (addresses (select 'address :order-by [addressid] :flatp t)))
        (values
          (equal addresses (select 'address :refresh t :flatp t))
          (equal addresses (select 'address :flatp t)))))
@@ -882,38 +887,56 @@
 
 (deftest :oodml/refresh/4
     (with-dataset *ds-employees*
-      (let* ((addresses (select 'address :order-by [addressid] :flatp t :refresh t))
+      (let* ((clsql-sys:*default-caching* t)
+             (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)))
-         (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)
+  3 4 t t)
 
 
-(deftest :oodml/uoj/1
+(deftest :oodml/uoj/full-set
     (with-dataset *ds-employees*
       (progn
-       (let* ((dea-list (select 'deferred-employee-address :caching nil :order-by ["ea_join" aaddressid]
-                                :flatp t))
+       (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-objects-joins dea-list)
+         (update-objects-joins dea-list :slots 'address :max-len nil)
          (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))
+  t t t t (1 1 2 2 2 3))
+
+(deftest :oodml/uoj/batched
+    (with-dataset *ds-employees*
+      (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-objects-joins dea-list :slots 'address :max-len 2)
+          (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 3))
 
 ;; update-object-joins needs to be fixed for multiple keys
 #+ignore
-(deftest :oodml/uoj/2
+(deftest :oodml/uoj/multi-key
     (progn
       (clsql:update-objects-joins (list company1))
       (mapcar #'(lambda (e)
@@ -1156,5 +1179,3 @@
 ))
 
 
-
-#.(clsql:restore-sql-reader-syntax-state)