X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=tests%2Ftest-oodml.lisp;h=cf9eda715d8253792e934cf2dec313f8ca46a44e;hb=70227e5f0b76bb649fc6c1a478d7374953fd815b;hp=f0cd3b01169cbf9041d96085048f50b264a3dbf6;hpb=7f0e4a65d1b425f2fa58fc7cce8296c1a6c52c2f;p=clsql.git diff --git a/tests/test-oodml.lisp b/tests/test-oodml.lisp index f0cd3b0..cf9eda7 100644 --- a/tests/test-oodml.lisp +++ b/tests/test-oodml.lisp @@ -3,35 +3,38 @@ ;;;; File: test-oodml.lisp ;;;; Author: Marcus Pearce ;;;; Created: 01/04/2004 -;;;; Updated: <04/04/2004 11:51:23 marcusp> +;;;; Updated: $Id$ ;;;; ====================================================================== ;;;; ;;;; Description ========================================================== ;;;; ====================================================================== ;;;; -;;;; Tests for the CLSQL-USQL Object Oriented Data Definition Language +;;;; Tests for the CLSQL Object Oriented Data Definition Language ;;;; (OODML). ;;;; ;;;; ====================================================================== -(in-package :clsql-usql-tests) +(in-package #:clsql-tests) -#.(usql:locally-enable-sql-reader-syntax) +#.(clsql:locally-enable-sql-reader-syntax) +(setq *rt-oodml* + '( + (deftest :oodml/select/1 (mapcar #'(lambda (e) (slot-value e 'last-name)) - (usql:select 'employee :order-by [last-name])) + (clsql:select 'employee :order-by [last-name])) ("Andropov" "Brezhnev" "Chernenko" "Gorbachev" "Kruschev" "Lenin" "Putin" "Stalin" "Trotsky" "Yeltsin")) (deftest :oodml/select/2 (mapcar #'(lambda (e) (slot-value e 'name)) - (usql:select 'company)) + (clsql:select 'company)) ("Widgets Inc.")) (deftest :oodml/select/3 (mapcar #'(lambda (e) (slot-value e 'companyid)) - (usql:select 'employee + (clsql:select 'employee :where [and [= [slot-value 'employee 'companyid] [slot-value 'company 'companyid]] [= [slot-value 'company 'name] @@ -43,21 +46,21 @@ (concatenate 'string (slot-value e 'first-name) " " (slot-value e 'last-name))) - (usql:select 'employee :where [= [slot-value 'employee 'first-name] + (clsql:select 'employee :where [= [slot-value 'employee 'first-name] "Vladamir"] :order-by [last-name])) ("Vladamir Lenin" "Vladamir Putin")) ;; sqlite fails this because it is typeless (deftest :oodml/select/5 - (length (sql:select 'employee :where [married])) + (length (clsql:select 'employee :where [married])) 3) ;; tests update-records-from-instance (deftest :oodml/update-records/1 (values (progn - (let ((lenin (car (usql:select 'employee + (let ((lenin (car (clsql:select 'employee :where [= [slot-value 'employee 'emplid] 1])))) (concatenate 'string @@ -70,8 +73,8 @@ (setf (slot-value employee1 'first-name) "Dimitriy" (slot-value employee1 'last-name) "Ivanovich" (slot-value employee1 'email) "ivanovich@soviet.org") - (usql:update-records-from-instance employee1) - (let ((lenin (car (usql:select 'employee + (clsql:update-records-from-instance employee1) + (let ((lenin (car (clsql:select 'employee :where [= [slot-value 'employee 'emplid] 1])))) (concatenate 'string @@ -84,8 +87,8 @@ (setf (slot-value employee1 'first-name) "Vladamir" (slot-value employee1 'last-name) "Lenin" (slot-value employee1 'email) "lenin@soviet.org") - (usql:update-records-from-instance employee1) - (let ((lenin (car (usql:select 'employee + (clsql:update-records-from-instance employee1) + (let ((lenin (car (clsql:select 'employee :where [= [slot-value 'employee 'emplid] 1])))) (concatenate 'string @@ -102,26 +105,26 @@ (deftest :oodml/update-records/2 (values (employee-email - (car (usql:select 'employee + (car (clsql:select 'employee :where [= [slot-value 'employee 'emplid] 1]))) (progn (setf (slot-value employee1 'email) "lenin-nospam@soviet.org") - (usql:update-record-from-slot employee1 'email) + (clsql:update-record-from-slot employee1 'email) (employee-email - (car (usql:select 'employee + (car (clsql:select 'employee :where [= [slot-value 'employee 'emplid] 1])))) (progn (setf (slot-value employee1 'email) "lenin@soviet.org") - (usql:update-record-from-slot employee1 'email) + (clsql:update-record-from-slot employee1 'email) (employee-email - (car (usql:select 'employee + (car (clsql:select 'employee :where [= [slot-value 'employee 'emplid] 1]))))) "lenin@soviet.org" "lenin-nospam@soviet.org" "lenin@soviet.org") ;; tests update-record-from-slots (deftest :oodml/update-records/3 (values - (let ((lenin (car (usql:select 'employee + (let ((lenin (car (clsql:select 'employee :where [= [slot-value 'employee 'emplid] 1])))) (concatenate 'string @@ -134,8 +137,8 @@ (setf (slot-value employee1 'first-name) "Dimitriy" (slot-value employee1 'last-name) "Ivanovich" (slot-value employee1 'email) "ivanovich@soviet.org") - (usql:update-record-from-slots employee1 '(first-name last-name email)) - (let ((lenin (car (usql:select 'employee + (clsql:update-record-from-slots employee1 '(first-name last-name email)) + (let ((lenin (car (clsql:select 'employee :where [= [slot-value 'employee 'emplid] 1])))) (concatenate 'string @@ -148,8 +151,8 @@ (setf (slot-value employee1 'first-name) "Vladamir" (slot-value employee1 'last-name) "Lenin" (slot-value employee1 'email) "lenin@soviet.org") - (usql:update-record-from-slots employee1 '(first-name last-name email)) - (let ((lenin (car (usql:select 'employee + (clsql:update-record-from-slots employee1 '(first-name last-name email)) + (let ((lenin (car (clsql:select 'employee :where [= [slot-value 'employee 'emplid] 1])))) (concatenate 'string @@ -172,12 +175,12 @@ ": " (slot-value employee1 'email)) (progn - (usql:update-records [employee] + (clsql:update-records [employee] :av-pairs '(([first-name] "Ivan") ([last-name] "Petrov") ([email] "petrov@soviet.org")) :where [= [emplid] 1]) - (usql:update-instance-from-records employee1) + (clsql:update-instance-from-records employee1) (concatenate 'string (slot-value employee1 'first-name) " " @@ -185,12 +188,12 @@ ": " (slot-value employee1 'email))) (progn - (usql:update-records [employee] + (clsql:update-records [employee] :av-pairs '(([first-name] "Vladamir") ([last-name] "Lenin") ([email] "lenin@soviet.org")) :where [= [emplid] 1]) - (usql:update-instance-from-records employee1) + (clsql:update-instance-from-records employee1) (concatenate 'string (slot-value employee1 'first-name) " " @@ -206,28 +209,28 @@ (values (slot-value employee1 'email) (progn - (usql:update-records [employee] + (clsql:update-records [employee] :av-pairs '(([email] "lenin-nospam@soviet.org")) :where [= [emplid] 1]) - (usql:update-slot-from-record employee1 'email) + (clsql:update-slot-from-record employee1 'email) (slot-value employee1 'email)) (progn - (usql:update-records [employee] + (clsql:update-records [employee] :av-pairs '(([email] "lenin@soviet.org")) :where [= [emplid] 1]) - (usql:update-slot-from-record employee1 'email) + (clsql:update-slot-from-record employee1 'email) (slot-value employee1 'email))) "lenin@soviet.org" "lenin-nospam@soviet.org" "lenin@soviet.org") ;(deftest :oodml/iteration/1 -; (usql:do-query ((e) [select 'usql-tests::employee :where [married] +; (clsql:do-query ((e) [select 'clsql-tests::employee :where [married] ; :order-by [emplid]]) ; (slot-value e last-name)) ; ("Lenin" "Stalin" "Trotsky")) ;(deftest :oodml/iteration/2 -; (usql:map-query 'list #'last-name [select 'employee :where [married] +; (clsql:map-query 'list #'last-name [select 'employee :where [married] ; :order-by [emplid]]) ; ("Lenin" "Stalin" "Trotsky")) @@ -237,5 +240,6 @@ ; collect (slot-value e 'last-name)) ; ("Lenin" "Stalin" "Trotsky")) +)) -#.(usql:restore-sql-reader-syntax-state) +#.(clsql:restore-sql-reader-syntax-state)