X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=tests%2Ftest-fddl.lisp;h=71094847f379cfaddac9f747d298b74dfda0d1fc;hb=8972490fe6f9453c5b70dae4fb1141cf9a67f0db;hp=c8efdd5d17351d2caa08a16aa1b3a7cd8fa56d03;hpb=f716bb1161cf9e89a96945c4a444244f9d303691;p=clsql.git

diff --git a/tests/test-fddl.lisp b/tests/test-fddl.lisp
index c8efdd5..7109484 100644
--- a/tests/test-fddl.lisp
+++ b/tests/test-fddl.lisp
@@ -28,7 +28,7 @@
            (sort (mapcar #'string-downcase
                          (clsql:list-tables :owner *test-database-user*))
                  #'string<))
-  "company" "employee" "type_table")
+  "address" "company" "ea_join" "employee" "type_table")
 
 ;; create a table, test for its existence, drop it and test again 
 (deftest :fddl/table/2
@@ -66,7 +66,7 @@
                     (clsql:list-attributes [employee]
                                           :owner *test-database-user*))
             #'string<))
-  "birthday" "companyid" "email" "emplid" "first_name" "groupid" "height"
+  "birthday" "ecompanyid" "email" "emplid" "first_name" "groupid" "height"
   "last_name" "managerid" "married")
 
 (deftest :fddl/attributes/2
@@ -76,7 +76,7 @@
                     (clsql:list-attribute-types [employee]
                                                :owner *test-database-user*))
             #'string<))
-  "birthday" "companyid" "email" "emplid" "first_name" "groupid" "height"
+  "birthday" "ecompanyid" "email" "emplid" "first_name" "groupid" "height"
   "last_name" "managerid" "married")
 
 ;; Attribute types are vendor specific so need to test a range
@@ -112,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]
@@ -206,14 +206,12 @@
 	 #'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)
        (progn
 	 (clsql:drop-index [bar] :on [i3test])
 	 (clsql:drop-index [foo] :on [i3test])
 	 (clsql:drop-table [i3test])
 	 t)))
-  t t 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