r9478: 25 May 2004 Kevin Rosenberg <kevin@rosenberg.net>

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

diff --git a/tests/test-init.lisp b/tests/test-init.lisp
index 9af59da503b6845fbcaee73612eaf5d07998abd1..6f15d412303d28bc4cd9a055bf08806b0152899d 100644 (file)
--- 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,6 +569,9 @@
          ((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))))