X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=tests%2Ftest-ooddl.lisp;h=497bef6099c10b9d5c4a33686cdc681e4c559555;hb=aced01441ccf8a826de544ed34bed4d8616a14ee;hp=51b8d2e227ace3833913cf2c5339705c5bc43a19;hpb=5a6f424f3c8920f8f11bbf1e3aed6b4c2c7e6af8;p=clsql.git

diff --git a/tests/test-ooddl.lisp b/tests/test-ooddl.lisp
index 51b8d2e..497bef6 100644
--- a/tests/test-ooddl.lisp
+++ b/tests/test-ooddl.lisp
@@ -3,15 +3,16 @@
 ;;;; File:    test-ooddl.lisp
 ;;;; Author:  Marcus Pearce <m.t.pearce@city.ac.uk>
 ;;;; Created: 30/03/2004
-;;;; Updated: $Id: $
-;;;; ======================================================================
-;;;;
-;;;; Description ==========================================================
-;;;; ======================================================================
+;;;; Updated: $Id$
 ;;;;
 ;;;; Tests for the CLSQL Object Oriented Data Definition Language
 ;;;; (OODDL).
 ;;;;
+;;;; This file is part of CLSQL.
+;;;;
+;;;; CLSQL users are granted the rights to distribute and use this software
+;;;; as governed by the terms of the Lisp Lesser GNU Public License
+;;;; (http://opensource.franz.com/preamble.html), also known as the LLGPL.
 ;;;; ======================================================================
 
 
@@ -19,28 +20,31 @@
 
 #.(clsql:locally-enable-sql-reader-syntax)
 
+(setq *rt-ooddl*
+      '(
+	
 ;; Ensure slots inherited from standard-classes are :virtual
 (deftest :ooddl/metaclass/1
     (values 
-     (clsql-sys::view-class-slot-db-kind
-      (clsql-sys::slotdef-for-slot-with-class 'extraterrestrial
+     (clsql::view-class-slot-db-kind
+      (clsql::slotdef-for-slot-with-class 'extraterrestrial
                                              (find-class 'person)))
-     (clsql-sys::view-class-slot-db-kind
-      (clsql-sys::slotdef-for-slot-with-class 'hobby (find-class 'person))))
+     (clsql::view-class-slot-db-kind
+      (clsql::slotdef-for-slot-with-class 'hobby (find-class 'person))))
   :virtual :virtual)
 
 ;; Ensure all slots in view-class are view-class-effective-slot-definition
 (deftest :ooddl/metaclass/2
     (values
      (every #'(lambda (slotd)
-                (typep slotd 'clsql-sys::view-class-effective-slot-definition))
-            (clsql-sys::class-slots (find-class 'person)))
+                (typep slotd 'clsql::view-class-effective-slot-definition))
+            (clsql::class-slots (find-class 'person)))
      (every #'(lambda (slotd)
-                (typep slotd 'clsql-sys::view-class-effective-slot-definition))
-            (clsql-sys::class-slots (find-class 'employee)))
+                (typep slotd 'clsql::view-class-effective-slot-definition))
+            (clsql::class-slots (find-class 'employee)))
      (every #'(lambda (slotd)
-                (typep slotd 'clsql-sys::view-class-effective-slot-definition))
-            (clsql-sys::class-slots (find-class 'company))))
+                (typep slotd 'clsql::view-class-effective-slot-definition))
+            (clsql::class-slots (find-class 'company))))
   t t t)
 
 (deftest :ooddl/join/1
@@ -58,30 +62,35 @@
   "Lenin")
 
 (deftest :ooddl/time/1
-    (let* ((now (clsql-base:get-time)))
-      (when (member *test-database-type* '(:postgresql :postgresql-socket))
+    (let* ((now (clsql:get-time)))
+      (when (member *test-database-underlying-type* '(:postgresql :postgresql-socket))
         (clsql:execute-command "set datestyle to 'iso'"))
       (clsql:update-records [employee] :av-pairs `((birthday ,now))
                            :where [= [emplid] 1])
-      (let ((dbobj (car (clsql:select 'employee :where [= [birthday] now]))))
+      (let ((dbobj (car (clsql:select 'employee :where [= [birthday] now] 
+				      :flatp t))))
         (values
          (slot-value dbobj 'last-name)
-         (clsql-base:time= (slot-value dbobj 'birthday) now))))
+         (clsql:time= (slot-value dbobj 'birthday) now))))
   "Lenin" t)
 
 (deftest :ooddl/time/2
-    (let* ((now (clsql-base:get-time))
+    (let* ((now (clsql:get-time))
            (fail-index -1))
-      (when (member *test-database-type* '(:postgresql :postgresql-socket))
+      (when (member *test-database-underlying-type* '(:postgresql :postgresql-socket))
         (clsql:execute-command "set datestyle to 'iso'"))
       (dotimes (x 40)
         (clsql:update-records [employee] :av-pairs `((birthday ,now))
                              :where [= [emplid] 1])
-        (let ((dbobj (car (clsql:select 'employee :where [= [birthday] now]))))
-          (unless (clsql-base:time= (slot-value dbobj 'birthday) now)
+        (let ((dbobj (car (clsql:select 'employee :where [= [birthday] now]
+					:flatp t))))
+          (unless (clsql:time= (slot-value dbobj 'birthday) now)
             (setf fail-index x))
-          (setf now (clsql-base:roll now :day (* 10 x)))))
+          (setf now (clsql:roll now :day (* 10 x)))))
       fail-index)
   -1)
 
+))
+
 #.(clsql:restore-sql-reader-syntax-state)
+