X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=tests%2Ftest-oodml.lisp;h=4848075cf30e5bded8a72e3e2c6f80686dcaf6c7;hb=2645bad6c8673a32408801e7ea1f8a02a1583d7d;hp=29b80592a9f75948a8cfe8478ca85dc0513ea077;hpb=818295fa37036acb348ff24ea926b9d7c9f33cba;p=clsql.git

diff --git a/tests/test-oodml.lisp b/tests/test-oodml.lisp
index 29b8059..4848075 100644
--- 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)
@@ -554,6 +555,8 @@
 	       (let ((sl (car (clsql:select 'subloc
 					    :where [= 10 [slot-value 'subloc 'subloc-id]]
 					    :flatp t :caching nil))))
+		 (unless sl
+		   (error "Couldn't find expected sublocation"))
 		 (format nil "~a ~a ~a"
 			 (slot-value sl 'subloc-id)
 			 (slot-value sl 'title)
@@ -576,6 +579,8 @@
 	       (let ((sl (car (clsql:select 'subloc
 					    :where [= 10 [slot-value 'subloc 'subloc-id]]
 					    :flatp t :caching nil))))
+		 (unless sl
+		   (error "In psfl: found no sublocation with id = 10"))
 		 (format nil "~a ~a ~a"
 			 (slot-value sl 'subloc-id)
 			 (slot-value sl 'title)
@@ -585,6 +590,8 @@
 	  (let ((sl (car (clsql:select 'subloc
 				       :where [= 10 [slot-value 'subloc 'subloc-id]]
 				       :flatp t :caching nil))))
+	    (unless sl
+	      (error "Select for modification: Found no sublocation with id = 10"))
 	    (setf (slot-value sl 'title) "Altered subloc title")
 	    (setf (slot-value sl 'loc) "Altered loc")
 	    (clsql:update-record-from-slot sl 'title)
@@ -593,9 +600,11 @@
 	  (let ((sl (car (clsql:select 'subloc
 				       :where [= 10 [slot-value 'subloc 'subloc-id]]
 				       :flatp t :caching nil))))
+	    (unless sl
+	      (error "Select for next modification: Found no sublocation with id = 10"))
 	    (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"
@@ -1147,6 +1156,3 @@
   t)
 ))
 
-
-
-#.(clsql:restore-sql-reader-syntax-state)