r9014: odbc backend now working on allegro and lispworks

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

diff --git a/tests/test-init.lisp b/tests/test-init.lisp
index ae0c6b4bf26bdc954b8dc81c70e6f65c31d450e0..4fe9c2e51bacd3fd291d7d9b9e08fbfa49f70868 100644 (file)
--- a/tests/test-init.lisp
+++ b/tests/test-init.lisp
@@ -22,6 +22,7 @@
 (defvar *rt-ooddl*)
 (defvar *rt-oodml*)
 (defvar *rt-syntax*)
+(defvar *rt-time*)
 
 (defvar *test-database-type* nil)
 (defvar *test-database-user* nil)
@@ -142,9 +143,10 @@
 (defparameter employee10 nil)
 
 (defun test-initialise-database ()
-  ;; Create the tables for our view classes
-  (ignore-errors (clsql:drop-view-from-class 'employee))
-  (ignore-errors (clsql:drop-view-from-class 'company))
+  ;; Remove the tables to support cases when destroy-database isn't supported, like odbc
+  (ignore-errors (clsql:drop-table "EMPLOYEE"))
+  (ignore-errors (clsql:drop-table "COMPANY"))
+  (ignore-errors (clsql:drop-table "FOO"))
   (clsql:create-view-from-class 'employee)
   (clsql:create-view-from-class 'company)
 
@@ -319,6 +321,8 @@
 
   (ignore-errors (destroy-database spec :database-type db-type))
   (ignore-errors (create-database spec :database-type db-type))
+  ;; Also manually delete the tables since destroy-database/create-database doesn't work on ODBC
+
   (dolist (test (append *rt-connection* *rt-fddl* *rt-fdml*
                        *rt-ooddl* *rt-oodml* *rt-syntax*))
     (eval test))