X-Git-Url: http://git.kpe.io/?p=clsql.git;a=blobdiff_plain;f=tests%2Ftest-fddl.lisp;h=0dc053b1307210b3e005f85c26b3039091b15669;hp=2cb4b2b64046f0ff268ae062f3149921b195f316;hb=9bbed78051e80e6ab76ae47834136035602bbbf1;hpb=23b76563b25a517ad20f29d6dc5a65c8b958a042

diff --git a/tests/test-fddl.lisp b/tests/test-fddl.lisp
index 2cb4b2b..0dc053b 100644
--- a/tests/test-fddl.lisp
+++ b/tests/test-fddl.lisp
@@ -1,9 +1,9 @@
 ;;;; -*- Mode: LISP; Syntax: ANSI-Common-Lisp; Base: 10 -*-
 ;;;; ======================================================================
-;;;; File:    test-fddl.lisp
-;;;; Author:  Marcus Pearce <m.t.pearce@city.ac.uk>
-;;;; Created: 30/03/2004
-;;;; Updated: $Id$
+;;;; File:     test-fddl.lisp
+;;;; Authors:  Marcus Pearce <m.t.pearce@city.ac.uk> and Kevin Rosenberg
+;;;; Created:  30/03/2004
+;;;; Updated:  $Id$
 ;;;;
 ;;;; Tests for the CLSQL Functional Data Definition Language
 ;;;; (FDDL).
@@ -27,8 +27,8 @@
     (apply #'values 
            (sort (mapcar #'string-downcase
                          (clsql:list-tables :owner *test-database-user*))
-                 #'string>))
-  "employee" "company")
+                 #'string<))
+  "company" "employee" "type_table")
 
 ;; create a table, test for its existence, drop it and test again 
 (deftest :fddl/table/2
@@ -79,6 +79,25 @@
   "birthday" "companyid" "email" "emplid" "first_name" "groupid" "height"
   "last_name" "managerid" "married")
 
+;; Attribute types are vendor specific so need to test a range
+(deftest :fddl/attributes/3
+    (and (member (clsql:attribute-type [emplid] [employee]) '(:int :integer :int4)) t)
+  t)
+
+(deftest :fddl/attributes/4
+    (clsql:attribute-type [first-name] [employee]) 
+  :varchar 30 nil 1)
+
+(deftest :fddl/attributes/5
+    (and (member (clsql:attribute-type [birthday] [employee]) '(:datetime :timestamp)) t)
+  t)
+
+(deftest :fddl/attributes/6
+    (and (member (clsql:attribute-type [height] [employee]) '(:float :float8)) t)
+  t)
+
+
+
 ;; create a view, test for existence, drop it and test again
 (deftest :fddl/view/1
     (progn (clsql:create-view [lenins-group]
@@ -93,7 +112,7 @@
   t nil)
   
   ;; create a view, list its attributes and drop it 
-(when (clsql-base-sys:db-type-has-views? *test-database-underlying-type*)
+(when (clsql-base:db-type-has-views? *test-database-underlying-type*)
   (deftest :fddl/view/2
       (progn (clsql:create-view [lenins-group]
 				:as [select [first-name] [last-name] [email]
@@ -172,26 +191,27 @@
 ;; test list-table-indexes
 (deftest :fddl/index/3
     (progn
-      (clsql:execute-command "CREATE TABLE I3TEST (a char(10), b integer)")
-      (clsql:create-index [bar] :on [i3test] :attributes
-			  '([a]) :unique t)
+      (clsql:create-table [i3test] '(([a] (string 10))
+				     ([b] integer)))
       (clsql:create-index [foo] :on [i3test] :attributes
-			  '([b]) :unique nil)
+       '([b]) :unique nil)
+      (clsql:create-index [bar] :on [i3test] :attributes
+       '([a]) :unique t)
       (values
-       
+       (clsql:table-exists-p [i3test])
+       (clsql:index-exists-p [foo])
+       (clsql:index-exists-p [bar])
        (sort 
 	(mapcar 
 	 #'string-downcase
 	 (clsql:list-table-indexes [i3test] :owner *test-database-user*))
-	    #'string-lessp)
-       (sort (clsql:list-table-indexes [company] :owner *test-database-user*)
-	     #'string-lessp)
+	#'string-lessp)
        (progn
 	 (clsql:drop-index [bar] :on [i3test])
 	 (clsql:drop-index [foo] :on [i3test])
-	 (clsql:execute-command "DROP TABLE I3TEST")
+	 (clsql:drop-table [i3test])
 	 t)))
-  ("bar" "foo") nil t)
+  t t t ("bar" "foo") t)
 
 ;; create an sequence, test for existence, drop it and test again 
 (deftest :fddl/sequence/1