X-Git-Url: http://git.kpe.io/?p=clsql.git;a=blobdiff_plain;f=tests%2Ftest-init.lisp;h=6f15d412303d28bc4cd9a055bf08806b0152899d;hp=d78e64ae978c4cdbf8359e83c2b43a46b32028b1;hb=e7a214b2445830219022acb5911a3f9303d938bd;hpb=2f185bf0167aa5a0be8e82a0c1ee961ca28f1426

diff --git a/tests/test-init.lisp b/tests/test-init.lisp
index d78e64a..6f15d41 100644
--- a/tests/test-init.lisp
+++ b/tests/test-init.lisp
@@ -55,15 +55,15 @@
     :initarg :groupid)
    (first-name
     :accessor first-name
-    :type (string 30)
+    :type (varchar 30)
     :initarg :first-name)
    (last-name
     :accessor last-name
-    :type (string 30)
+    :type (varchar 30)
     :initarg :last-name)
    (email
     :accessor employee-email
-    :type (string 100)
+    :type (varchar 100)
     :initarg :email)
    (ecompanyid
     :type integer
@@ -107,7 +107,7 @@
     :type integer
     :initarg :groupid)
    (name
-    :type (string 100)
+    :type (varchar 100)
     :initarg :name)
    (presidentid
     :type integer
@@ -137,13 +137,13 @@
     :type integer
     :initarg :street-number)
    (street-name
-    :type (string 30)
+    :type (varchar 30)
     :void-value ""
     :initarg :street-name)
    (city
     :column "city_field"
     :void-value "no city"
-    :type (string 30)
+    :type (varchar 30)
     :initarg :city)
    (postal-code
     :column zip
@@ -482,7 +482,7 @@
 	  (machine-type)
 	  db-type
 	  (if (not (eq db-type *test-database-underlying-type*))
-	      (format nil " with underlying type ~A" 
+	      (format nil " with underlying type ~:@(~A~)" 
 		      *test-database-underlying-type*)
 	      "")
 	  ))
@@ -569,17 +569,21 @@
 	  ((and (null (clsql-sys:db-type-has-union? db-underlying-type))
 		(clsql-sys:in test :fdml/query/6 :fdml/select/31))
 	   (push (cons test "union not supported") skip-tests))
+	  ((and (eq *test-database-type* :oracle)
+		(clsql-sys:in test :fdml/query/8 :fdml/select/21))
+	   (push (cons test "syntax not supported") skip-tests))
 	  (t
 	   (push test-form test-forms)))))
       (values (nreverse test-forms) (nreverse skip-tests))))
 
 
-(defun rapid-load (type)
+(defun rapid-load (type &optional (position 0))
   "Rapid load for interactive testing."
   (when *default-database*
       (disconnect :database *default-database*))
-  (test-connect-to-database type (car (db-type-spec type (read-specs))))
-  (test-initialise-database))
+  (test-connect-to-database type (nth position (db-type-spec type (read-specs))))
+  (test-initialise-database)
+  *default-database*)
 
 (defun rl ()
   (rapid-load :postgresql))