Fixing bug in test 9-slots

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

diff --git a/tests/test-oodml.lisp b/tests/test-oodml.lisp
index 978d1fd732d6abefa6e6c76e1db47abc394e9e33..103de94744425a292c693f9e4f7b1f68ea2bd4e6 100644 (file)
--- a/tests/test-oodml.lisp
+++ b/tests/test-oodml.lisp
@@ -587,7 +587,7 @@
                                       :flatp t :caching nil))))
            (setf (slot-value sl 'title) "subloc-1")
            (setf (slot-value sl 'loc) "a subloc")
-           (clsql:update-record-from-slot sl '(title loc))
+           (clsql:update-record-from-slots sl '(title loc))
            (print-fresh-subloc)))))
   "10 subloc-1 a subloc"
   "10 Altered subloc title Altered loc"
@@ -597,7 +597,7 @@
 ;; (was failing in Postgresql at somepoint)
 (deftest :oodml/update-records/10
     (with-dataset *ds-employees*
-      (let ((emp (first (clsql:select 'employee :where [= [emplid] 1] :flatp T))))
+      (let ((emp (first (clsql:select 'employee :where [= [emplid] 1] :flatp t))))
        (setf (height emp) nil)
        (clsql-sys:update-record-from-slot emp 'height)
        (values
@@ -745,22 +745,22 @@
           (print-subloc (sl)
             (format nil "~a: ~a"
                     (slot-value sl 'node-id) (slot-value sl 'loc))))
-       (with-dataset *ds-nodes*
-      (values
-       (print-loc loc2)
-       (print-subloc subloc2)
-       (progn
-         (clsql:update-records [node]
-                               :av-pairs '(([title] "altered title"))
-                               :where [= [node-id] 9])
-         (clsql:update-slot-from-record loc2 'title)
-         (print-loc loc2))
-       (progn
-         (clsql:update-records [subloc]
-                               :av-pairs '(([loc] "altered loc"))
-                               :where [= [subloc-id] 11])
-         (clsql:update-slot-from-record subloc2 'loc)
-         (print-subloc subloc2)))))
+      (with-dataset *ds-nodes*
+       (values
+         (print-loc loc2)
+         (print-subloc subloc2)
+         (progn
+           (clsql:update-records [node]
+                                 :av-pairs '(([title] "altered title"))
+                                 :where [= [node-id] 9])
+           (clsql:update-slot-from-record loc2 'title)
+           (print-loc loc2))
+         (progn
+           (clsql:update-records [subloc]
+                                 :av-pairs '(([loc] "altered loc"))
+                                 :where [= [subloc-id] 11])
+           (clsql:update-slot-from-record subloc2 'loc)
+           (print-subloc subloc2)))))
   "9: location-2" "11: second subloc"
   "9: altered title" "11: altered loc")
 
@@ -970,7 +970,8 @@
       (values
        (let ((inst (make-instance 'theme
                                   :title "test-theme" :vars "test-vars"
-                                  :doc "test-doc")))
+                                  :doc "test-doc"))
+              (*print-circle* nil))
          (setf (slot-value inst 'title) "alternate-test-theme")
          (format nil "~a ~a ~a ~a"
                  (or (select [title] :from [node]