r9228: add tests for result-types for map-query and do-query, ignore incorrect select...

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

diff --git a/tests/test-ooddl.lisp b/tests/test-ooddl.lisp
index 51b8d2e227ace3833913cf2c5339705c5bc43a19..3bbaa2d1d7f44a568660753c82d95aeb958139eb 100644 (file)
--- 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,6 +20,9 @@
 
 #.(clsql:locally-enable-sql-reader-syntax)
 
+(setq *rt-ooddl*
+      '(
+       
 ;; Ensure slots inherited from standard-classes are :virtual
 (deftest :ooddl/metaclass/1
     (values 
@@ -59,11 +63,12 @@
 
 (deftest :ooddl/time/1
     (let* ((now (clsql-base:get-time)))
-      (when (member *test-database-type* '(:postgresql :postgresql-socket))
+      (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))))
@@ -72,16 +77,20 @@
 (deftest :ooddl/time/2
     (let* ((now (clsql-base: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]))))
+        (let ((dbobj (car (clsql:select 'employee :where [= [birthday] now]
+                                       :flatp t))))
           (unless (clsql-base:time= (slot-value dbobj 'birthday) now)
             (setf fail-index x))
           (setf now (clsql-base:roll now :day (* 10 x)))))
       fail-index)
   -1)
 
+))
+
 #.(clsql:restore-sql-reader-syntax-state)
+