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

diff --git a/tests/test-init.lisp b/tests/test-init.lisp
index d98cbf2..6f15d41 100644
--- a/tests/test-init.lisp
+++ b/tests/test-init.lisp
@@ -19,6 +19,7 @@
 (defvar *report-stream* *standard-output* "Stream to send text report.")
 (defvar *sexp-report-stream* nil "Stream to send sexp report.")
 (defvar *rt-connection*)
+(defvar *rt-basic*)
 (defvar *rt-fddl*)
 (defvar *rt-fdml*)
 (defvar *rt-ooddl*)
@@ -54,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
@@ -106,7 +107,7 @@
     :type integer
     :initarg :groupid)
    (name
-    :type (string 100)
+    :type (varchar 100)
     :initarg :name)
    (presidentid
     :type integer
@@ -136,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
@@ -171,7 +172,8 @@
 	    :db-info (:join-class address
 				  :home-key aaddressid
 				  :foreign-key addressid
-				  :retrieval :deferred)))
+				  :retrieval :deferred
+				  :set nil)))
   (:base-table "ea_join"))
 
 (defun test-connect-to-database (db-type spec)
@@ -180,8 +182,10 @@
     (ignore-errors (create-database spec :database-type db-type)))
   
   (setf *test-database-type* db-type)
-  (when (>= (length spec) 3)
-    (setq *test-database-user* (third spec)))
+  (setf *test-database-user*
+    (cond
+     ((eq :oracle db-type) (second spec))
+     ((>= (length spec) 3) (third spec))))
   
   ;; Connect to the database
   (clsql:connect spec
@@ -218,7 +222,6 @@
 
 (defun test-initialise-database ()
   (test-basic-initialize)
-  
   (let ((*backend-warning-behavior*
 	 (if (member *test-database-type* '(:postgresql :postgresql-socket))
 	     :ignore
@@ -467,7 +470,7 @@
 ***     CLSQL ~A begun at ~A
 ***     ~A
 ***     ~A on ~A
-***     Database ~A backend~A.
+***     Database ~:@(~A~) backend~A.
 ******************************************************************************
 "
 	  report-type
@@ -479,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*)
 	      "")
 	  ))
@@ -525,11 +528,9 @@
 
 
 (defun compute-tests-for-backend (db-type db-underlying-type)
-  (declare (ignorable db-type))
   (let ((test-forms '())
 	(skip-tests '()))
-    (dolist (test-form (append (test-basic-forms)
-			       *rt-connection* *rt-fddl* *rt-fdml*
+    (dolist (test-form (append *rt-connection* *rt-basic* *rt-fddl* *rt-fdml*
 			       *rt-ooddl* *rt-oodml* *rt-syntax*))
       (let ((test (second test-form)))
 	(cond
@@ -540,7 +541,8 @@
 		(clsql-sys:in test :fdml/select/11 :oodml/select/5))
 	   (push (cons test "boolean where not supported") skip-tests))
 	  ((and (null (clsql-sys:db-type-has-subqueries? db-underlying-type))
-		(clsql-sys:in test :fdml/select/5 :fdml/select/10))
+		(clsql-sys:in test :fdml/select/5 :fdml/select/10
+                              :fdml/select/32 :fdml/select/33))
 	   (push (cons test "subqueries not supported") skip-tests))
 	  ((and (null (clsql-sys:db-type-transaction-capable? db-underlying-type
 						    *default-database*))
@@ -551,23 +553,37 @@
 	   (push (cons test "fancy math not supported") skip-tests))
 	  ((and (eql *test-database-type* :sqlite)
 		(clsql-sys:in test :fddl/view/4 :fdml/select/10
-				:fdml/select/21))
+				:fdml/select/21 :fdml/select/32 
+                                :fdml/select/33))
 	   (push (cons test "not supported by sqlite") skip-tests))
+	  ((and (not (clsql-sys:db-type-has-bigint? db-type))
+		(clsql-sys:in test :basic/bigint/1))
+	   (push (cons test "bigint not supported") skip-tests))
+	  ((and (eql *test-database-underlying-type* :mysql)
+		(clsql-sys:in test :fdml/select/26))
+	   (push (cons test "string table aliases not supported on all mysql versions") skip-tests))
 	  ((and (eql *test-database-underlying-type* :mysql)
 		(clsql-sys:in test :fdml/select/22 :fdml/query/5 
 				:fdml/query/7 :fdml/query/8))
 	   (push (cons test "not supported by mysql") skip-tests))
+	  ((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))
@@ -576,4 +592,4 @@
   (rapid-load :mysql))
 
 (defun rlo ()
-  (rapid-load :odbc))
+  (rapid-load :oracle))