X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=tests%2Ftest-fddl.lisp;h=bafa1c55c79150e17a3214185c7363c4da4c3c9c;hb=a9f57540c378329f627b5b3bd2a2991689638331;hp=918c56f878ca0b964f701527437c82512274df6c;hpb=70227e5f0b76bb649fc6c1a478d7374953fd815b;p=clsql.git

diff --git a/tests/test-fddl.lisp b/tests/test-fddl.lisp
index 918c56f..bafa1c5 100644
--- a/tests/test-fddl.lisp
+++ b/tests/test-fddl.lisp
@@ -4,14 +4,15 @@
 ;;;; Author:  Marcus Pearce <m.t.pearce@city.ac.uk>
 ;;;; Created: 30/03/2004
 ;;;; Updated: $Id$
-;;;; ======================================================================
-;;;;
-;;;; Description ==========================================================
-;;;; ======================================================================
 ;;;;
 ;;;; Tests for the CLSQL Functional Data Definition Language
 ;;;; (FDDL).
-;;;; 
+;;;;
+;;;; 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.
 ;;;; ======================================================================
 
 (in-package #:clsql-tests)
@@ -27,7 +28,7 @@
            (sort (mapcar #'string-downcase
                          (clsql:list-tables :owner *test-database-user*))
                  #'string>))
-  "employee" "company" "clsql_object_v")
+  "employee" "company")
 
 ;; create a table, test for its existence, drop it and test again 
 (deftest :fddl/table/2
@@ -130,25 +131,23 @@
 
 ;; not in sqlite 
 (deftest :fddl/view/4
-    (if (eql *test-database-type* :sqlite)
-        (values nil '(("Josef" "Stalin" "stalin@soviet.org")))
-        (progn (clsql:create-view [lenins-group]
-                                 :column-list '([forename] [surname] [email])
-                                 :as [select [first-name] [last-name] [email]
-                                             :from [employee]
-                                             :where [= [managerid] 1]])
-               (let ((result 
-                      (list
-                       ;; Shouldn't exist 
+    (progn (clsql:create-view [lenins-group]
+	    :column-list '([forename] [surname] [email])
+	    :as [select [first-name] [last-name] [email]
+	    :from [employee]
+	    :where [= [managerid] 1]])
+	   (let ((result 
+		  (list
+		   ;; Shouldn't exist 
                        (clsql:select [forename] [surname] [email]
-                                    :from [lenins-group]
-                                    :where [= [surname] "Lenin"])
-                       ;; Should exist 
+				     :from [lenins-group]
+				     :where [= [surname] "Lenin"])
+		       ;; Should exist 
                        (car (clsql:select [forename] [surname] [email]
-                                         :from [lenins-group]
-                                         :where [= [surname] "Stalin"])))))
-                 (clsql:drop-view [lenins-group] :if-does-not-exist :ignore)
-                 (apply #'values result))))
+					  :from [lenins-group]
+					  :where [= [surname] "Stalin"])))))
+	     (clsql:drop-view [lenins-group] :if-does-not-exist :ignore)
+	     (apply #'values result)))
   nil ("Josef" "Stalin" "stalin@soviet.org"))
 
 ;; create an index, test for existence, drop it and test again 
@@ -164,7 +163,7 @@
                                   :if-does-not-exist :ignore))
                 (t 
                  (clsql:drop-index [bar]:if-does-not-exist :ignore)))
-              (clsql:view-exists-p [bar] :owner *test-database-user*))))
+              (clsql:index-exists-p [bar] :owner *test-database-user*))))
   t nil)
 
 ;; create indexes with names as strings, symbols and in square brackets