X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=tests%2Ftest-init.lisp;h=a1f700e90c0f5374cf8d6ce087df1c2458c19cab;hb=8972490fe6f9453c5b70dae4fb1141cf9a67f0db;hp=f4268d7f32326713a81a4d14844057c238e43ec1;hpb=9f88a2a19d13afb9ab7f35ad1df522d00301b56d;p=clsql.git

diff --git a/tests/test-init.lisp b/tests/test-init.lisp
index f4268d7..a1f700e 100644
--- a/tests/test-init.lisp
+++ b/tests/test-init.lisp
@@ -38,7 +38,7 @@
            :initarg :height)
    (married :db-kind :base :accessor married :type boolean
             :initarg :married)
-   (birthday :type clsql-base:wall-time :initarg :birthday)
+   (birthday :type clsql:wall-time :initarg :birthday)
    (hobby :db-kind :virtual :initarg :hobby :initform nil)))
   
 (def-view-class employee (person)
@@ -64,14 +64,14 @@
     :accessor employee-email
     :type (string 100)
     :initarg :email)
-   (companyid
+   (ecompanyid
     :type integer
     :initarg :companyid)
    (company
     :accessor employee-company
     :db-kind :join
     :db-info (:join-class company
-			  :home-key companyid
+			  :home-key ecompanyid
 			  :foreign-key companyid
 			  :set nil))
    (managerid
@@ -89,7 +89,7 @@
     :db-kind :join
     :db-info (:join-class employee-address
 			  :home-key emplid
-			  :foreign-key emplid
+			  :foreign-key aemplid
 			  :target-slot address
 			  :set t)))
   (:base-table employee))
@@ -123,7 +123,7 @@
     :db-kind :join
     :db-info (:join-class employee
 			  :home-key (companyid groupid)
-			  :foreign-key (companyid groupid)
+			  :foreign-key (ecompanyid groupid)
 			  :set t)))
   (:base-table company))
 
@@ -154,15 +154,16 @@
 
 ;; many employees can reside at many addressess
 (def-view-class employee-address ()
-  ((emplid :type integer
+  ((aemplid :type integer
 	   :initarg :emplid)
-   (addressid :type integer
+   (aaddressid :type integer
 	      :initarg :addressid)
    (address :db-kind :join
 	    :db-info (:join-class address
-				  :home-key addressid
+				  :home-key aaddressid
 				  :foreign-key addressid
-				  :retrieval :immediate))))
+				  :retrieval :immediate)))
+  (:base-table "ea_join"))
 
 (defun test-connect-to-database (db-type spec)
   (when (db-backend-has-create/destroy-db? db-type)
@@ -218,7 +219,7 @@
     (clsql:create-view-from-class 'address)
     (clsql:create-view-from-class 'employee-address))
 
-  (let ((*update-records-on-make-instance* t))
+  (let ((*db-auto-sync* t))
     (setf company1 (make-instance 'company
 				  :presidentid 1
 				  :companyid 1
@@ -229,7 +230,7 @@
 				   :groupid 1
 				   :married t 
 				   :height (1+ (random 1.00))
-				   :birthday (clsql-base:get-time)
+				   :birthday (clsql:get-time)
 				   :first-name "Vladamir"
 				   :last-name "Lenin"
 				   :email "lenin@soviet.org"
@@ -239,7 +240,7 @@
 				   :groupid 1
 				   :height (1+ (random 1.00))
 				   :married t 
-				   :birthday (clsql-base:get-time)
+				   :birthday (clsql:get-time)
 				   :first-name "Josef"
 				   :last-name "Stalin"
 				   :email "stalin@soviet.org"
@@ -250,7 +251,7 @@
 				   :groupid 1
 				   :height (1+ (random 1.00))
 				   :married t 
-				   :birthday (clsql-base:get-time)
+				   :birthday (clsql:get-time)
 				   :first-name "Leon"
 				   :last-name "Trotsky"
 				   :email "trotsky@soviet.org"
@@ -261,7 +262,7 @@
 				   :groupid 1
 				   :height (1+ (random 1.00))
 				   :married nil
-				   :birthday (clsql-base:get-time)
+				   :birthday (clsql:get-time)
 				   :first-name "Nikita"
 				   :last-name "Kruschev"
 				   :email "kruschev@soviet.org"
@@ -272,7 +273,7 @@
 				   :groupid 1
 				   :married nil
 				   :height (1+ (random 1.00))
-				   :birthday (clsql-base:get-time)
+				   :birthday (clsql:get-time)
 				   :first-name "Leonid"
 				   :last-name "Brezhnev"
 				   :email "brezhnev@soviet.org"
@@ -283,7 +284,7 @@
 				   :groupid 1
 				   :married nil
 				   :height (1+ (random 1.00))
-				   :birthday (clsql-base:get-time)
+				   :birthday (clsql:get-time)
 				   :first-name "Yuri"
 				   :last-name "Andropov"
 				   :email "andropov@soviet.org"
@@ -294,7 +295,7 @@
 				   :groupid 1
 				   :height (1+ (random 1.00))
 				   :married nil
-				   :birthday (clsql-base:get-time)
+				   :birthday (clsql:get-time)
 				   :first-name "Konstantin"
 				   :last-name "Chernenko"
 				   :email "chernenko@soviet.org"
@@ -305,7 +306,7 @@
 				   :groupid 1
 				   :height (1+ (random 1.00))
 				   :married nil
-				   :birthday (clsql-base:get-time)
+				   :birthday (clsql:get-time)
 				   :first-name "Mikhail"
 				   :last-name "Gorbachev"
 				   :email "gorbachev@soviet.org"
@@ -316,7 +317,7 @@
 				   :groupid 1 
 				   :married nil
 				   :height (1+ (random 1.00))
-				   :birthday (clsql-base:get-time)
+				   :birthday (clsql:get-time)
 				   :first-name "Boris"
 				   :last-name "Yeltsin"
 				   :email "yeltsin@soviet.org"
@@ -327,7 +328,7 @@
 				    :groupid 1
 				    :married nil
 				    :height (1+ (random 1.00))
-				    :birthday (clsql-base:get-time)
+				    :birthday (clsql:get-time)
 				    :first-name "Vladamir"
 				    :last-name "Putin"
 				    :email "putin@soviet.org"
@@ -457,9 +458,9 @@
 ******************************************************************************
 "
 	  report-type
-	  (clsql-base:format-time 
+	  (clsql:format-time 
 	   nil 
-	   (clsql-base:utime->time (get-universal-time)))
+	   (clsql:utime->time (get-universal-time)))
 	  (lisp-implementation-type)
 	  (lisp-implementation-version)
 	  (machine-type)
@@ -542,3 +543,10 @@
 	   (push test-form test-forms)))))
     (values (nreverse test-forms) (nreverse skip-tests))))
 
+
+(defun rl ()
+  "Rapid load for interactive testing."
+  (when *default-database*
+      (disconnect :database *default-database*))
+  (test-connect-to-database :postgresql (car (postgresql-spec (read-specs))))
+  (test-initialise-database))