projects
/
clsql.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
use &body instead of &rest to aid emacs indentation
[clsql.git]
/
tests
/
test-oodml.lisp
diff --git
a/tests/test-oodml.lisp
b/tests/test-oodml.lisp
index d1c933a432d75c8340b047651fbe092590457efa..4848075cf30e5bded8a72e3e2c6f80686dcaf6c7 100644
(file)
--- a/
tests/test-oodml.lisp
+++ b/
tests/test-oodml.lisp
@@
-15,7
+15,8
@@
(in-package #:clsql-tests)
(in-package #:clsql-tests)
-#.(clsql:locally-enable-sql-reader-syntax)
+(clsql-sys:file-enable-sql-reader-syntax)
+
(setq *rt-oodml*
'(
(setq *rt-oodml*
'(
@@
-127,7
+128,7
@@
;; test retrieval of node, derived nodes etc
(deftest :oodml/select/12
(with-dataset *ds-nodes*
;; test retrieval of node, derived nodes etc
(deftest :oodml/select/12
(with-dataset *ds-nodes*
- (length (clsql:select 'node :where [no
de-id
] :flatp t :caching nil)))
+ (length (clsql:select 'node :where [no
t [null [node-id]]
] :flatp t :caching nil)))
11)
(deftest :oodml/select/13
11)
(deftest :oodml/select/13
@@
-140,7
+141,7
@@
(deftest :oodml/select/14
(with-dataset *ds-nodes*
(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
4)
(deftest :oodml/select/15
@@
-155,7
+156,7
@@
(deftest :oodml/select/16
(with-dataset *ds-nodes*
(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
2)
(deftest :oodml/select/17
@@
-170,7
+171,7
@@
(deftest :oodml/select/18
(with-dataset *ds-nodes*
(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
2)
(deftest :oodml/select/19
@@
-203,7
+204,7
@@
(deftest :oodml/select/22
(with-dataset *ds-nodes*
(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)
(values
(slot-value a 'node-id)
(slot-value a 'subloc-id)
@@
-216,6
+217,8
@@
(length (clsql:select 'artist :flatp t :caching nil)))
0)
(length (clsql:select 'artist :flatp t :caching nil)))
0)
+
+
;; test retrieval is deferred
(deftest :oodm/retrieval/1
(with-dataset *ds-employees*
;; test retrieval is deferred
(deftest :oodm/retrieval/1
(with-dataset *ds-employees*
@@
-304,15
+307,16
@@
;; tests update-record-from-slot
(deftest :oodml/update-records/2
(with-dataset *ds-employees*
;; tests update-record-from-slot
(deftest :oodml/update-records/2
(with-dataset *ds-employees*
+ ;(start-sql-recording :type :both)
(values
(employee-email
(car (clsql:select 'employee
:where [= 1 [slot-value 'employee 'emplid]]
:flatp t
:caching nil)))
(values
(employee-email
(car (clsql:select 'employee
:where [= 1 [slot-value 'employee 'emplid]]
:flatp t
:caching nil)))
- (progn
- (setf (slot-value employee1 'email) "lenin-nospam@soviet.org")
- (clsql:update-record-from-slot employee1 'email)
+ (progn
+ (setf (slot-value employee1 'email) "lenin-nospam@soviet.org")
+ (clsql:update-record-from-slot employee1 'email)
(employee-email
(car (clsql:select 'employee
:where [= 1 [slot-value 'employee 'emplid]]
(employee-email
(car (clsql:select 'employee
:where [= 1 [slot-value 'employee 'emplid]]
@@
-551,6
+555,8
@@
(let ((sl (car (clsql:select 'subloc
:where [= 10 [slot-value 'subloc 'subloc-id]]
:flatp t :caching nil))))
(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)
(format nil "~a ~a ~a"
(slot-value sl 'subloc-id)
(slot-value sl 'title)
@@
-573,6
+579,8
@@
(let ((sl (car (clsql:select 'subloc
:where [= 10 [slot-value 'subloc 'subloc-id]]
:flatp t :caching nil))))
(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)
(format nil "~a ~a ~a"
(slot-value sl 'subloc-id)
(slot-value sl 'title)
@@
-582,6
+590,8
@@
(let ((sl (car (clsql:select 'subloc
:where [= 10 [slot-value 'subloc 'subloc-id]]
:flatp t :caching nil))))
(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)
(setf (slot-value sl 'title) "Altered subloc title")
(setf (slot-value sl 'loc) "Altered loc")
(clsql:update-record-from-slot sl 'title)
@@
-590,9
+600,11
@@
(let ((sl (car (clsql:select 'subloc
:where [= 10 [slot-value 'subloc 'subloc-id]]
:flatp t :caching nil))))
(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")
(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-slot
s
sl '(title loc))
(print-fresh-subloc)))))
"10 subloc-1 a subloc"
"10 Altered subloc title Altered loc"
(print-fresh-subloc)))))
"10 subloc-1 a subloc"
"10 Altered subloc title Altered loc"
@@
-625,6
+637,12
@@
(list (name artist1) (artist_id artist1)))
("Mogwai" 1))
(list (name artist1) (artist_id artist1)))
("Mogwai" 1))
+(deftest :oodml/update-records/12
+ (with-dataset *ds-artists*
+ (clsql:update-records-from-instance artist1)
+ (list (name artist1) (genre artist1)))
+ ("Mogwai" "Unknown"))
+
;; tests update-instance-from-records
(deftest :oodml/update-instance/1
(with-dataset *ds-employees*
;; tests update-instance-from-records
(deftest :oodml/update-instance/1
(with-dataset *ds-employees*
@@
-1138,6
+1156,3
@@
t)
))
t)
))
-
-
-#.(clsql:restore-sql-reader-syntax-state)