X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=tests%2Ftest-init.lisp;h=415af2a2b81a3c5f9b562de889f47c20a21411e5;hb=645d2ea7396466b8673e3421b55e45cd327f0195;hp=543ab871f6bfefebd69093f8cadeb4478cfeb3df;hpb=63158b2ef9d21af6454966d78b7e3ea81a9c73aa;p=clsql.git

diff --git a/tests/test-init.lisp b/tests/test-init.lisp
index 543ab87..415af2a 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
@@ -176,6 +176,10 @@
 				  :set nil)))
   (:base-table "ea_join"))
 
+(def-view-class big ()
+  ((i :type integer :initarg :i)
+   (bi :type bigint :initarg :bi)))
+
 (defun test-connect-to-database (db-type spec)
   (when (clsql-sys:db-backend-has-create/destroy-db? db-type)
     (ignore-errors (destroy-database spec :database-type db-type))
@@ -229,7 +233,8 @@
     (clsql:create-view-from-class 'employee)
     (clsql:create-view-from-class 'company)
     (clsql:create-view-from-class 'address)
-    (clsql:create-view-from-class 'employee-address))
+    (clsql:create-view-from-class 'employee-address)
+    (clsql:create-view-from-class 'big))
 
   (let ((*db-auto-sync* t))
     (setf company1 (make-instance 'company
@@ -372,8 +377,11 @@
 					   :verified nil)
 	  employee-address5 (make-instance 'employee-address
 					   :emplid 3
-					   :addressid 2)
-	  ))
+					   :addressid 2))
+
+    (let ((max (expt 2 60)))
+      (dotimes (i 555)
+	(make-instance 'big :i (1+ i) :bi (truncate max (1+ i))))))
     
   ;; sleep to ensure birthdays are no longer at current time
   (sleep 1) 
@@ -482,7 +490,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,16 +577,19 @@
 	  ((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-connect-to-database type (nth position (db-type-spec type (read-specs))))
   (test-initialise-database)
   *default-database*)