X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=tests%2Ftest-time.lisp;h=050e07fd380d3e9263c8f47f0795bac233ba720d;hb=b6c281d8fc5a6cd531572f1b4c45fbabba2200f9;hp=39cc93061bfe5e59520480a82f6bb3022e0e3c23;hpb=26720328bdd7d8f28c3247063c477f05f3a7251e;p=clsql.git

diff --git a/tests/test-time.lisp b/tests/test-time.lisp
index 39cc930..050e07f 100644
--- a/tests/test-time.lisp
+++ b/tests/test-time.lisp
@@ -1,5 +1,4 @@
 ;;; -*- Mode: Lisp -*-
-;;; $Id$
 ;;;
 ;;; Copyright (c) 2000, 2001 onShore Development, Inc.
 ;;;
@@ -9,18 +8,20 @@
 #.(clsql-sys:locally-enable-sql-reader-syntax)
 
 (def-view-class datetest ()
-  ((testtimetz :COLUMN "testtimetz" :TYPE
-	       clsql-sys:wall-time :DB-KIND :BASE
-	       :DB-CONSTRAINTS COMMON-LISP:NIL
-	       :ACCESSOR testtimetz :INITARG
-	       :testtimetz :INITFORM COMMON-LISP:NIL
-	       :DB-TYPE "timestamp with time zone")
-   (testtime :COLUMN "testtime" :TYPE
-	     clsql-sys:wall-time :DB-KIND :BASE
-	     :DB-CONSTRAINTS COMMON-LISP:NIL
-	     :ACCESSOR testtime :INITARG
-	     :testtime :INITFORM COMMON-LISP:NIL
-	     :DB-TYPE "timestamp without time zone")))
+  ((testtimetz :column "testtimetz"
+                :type clsql-sys:wall-time
+                :db-kind :base
+                :db-constraints nil
+	        :accessor testtimetz :initarg :testtimetz
+                :initform nil
+	        :db-type "timestamp with time zone")
+   (testtime :column "testtime"
+             :type clsql-sys:wall-time
+             :db-kind :base
+	     :db-constraints nil
+	     :accessor testtime :initarg :testtime
+             :initform nil
+	     :db-type "timestamp without time zone")))
 
 (def-dataset *ds-datetest*
   (:setup (lambda () (clsql-sys:create-view-from-class 'datetest)))
@@ -304,7 +305,7 @@
 				  :values (list time))
 	(let ((testtime
 	       (first (clsql:select [testtime]
-				    :from [datetest] :flatp T
+				    :from [datetest] :flatp t
 				    :where [= [testtime] time] ))))
 	  (format-time nil (parse-timestring testtime) :format :iso)
 	  )))
@@ -318,7 +319,7 @@
 				  :values (list time))
 	(let ((testtime
 	       (first (clsql:select [testtime]
-				    :from [datetest] :flatp T
+				    :from [datetest] :flatp t
 				    :where [= [testtime] time] ))))
 	  (format-time nil (parse-timestring testtime) :format :iso)
 	  )))
@@ -334,7 +335,7 @@
 				  :values (list time))
 	(let ((testtime
 	       (first (clsql:select [testtime]
-				    :from [datetest] :flatp T
+				    :from [datetest] :flatp t
 				    :where [= [testtime] time] ))))
 	  (format-time nil (parse-timestring testtime) :format :iso)
 	  )))
@@ -348,7 +349,7 @@
 				  :values (list time))
 	(let ((testtime
 	       (first (clsql:select [testtime]
-				    :from [datetest] :flatp T
+				    :from [datetest] :flatp t
 				    :where [= [testtime] time] ))))
 	  (format-time nil (parse-timestring testtime) :format :iso)
 	  )))
@@ -363,7 +364,7 @@
 	(let ((testtime
 	       (first (clsql:select [testtime]
 				    :from [datetest]
-				    :limit 1 :flatp T
+				    :limit 1 :flatp t
 				    :where [= [testtime] time] ))))
 	  (format-time nil (parse-timestring testtime) :format :iso)
 	  )))
@@ -394,7 +395,7 @@
       (destructuring-bind (testtimetz testtime)
 	  (first (clsql:select [testtimetz] [testtime]
 			       :from [datetest]
-			       :limit 1 :flatp T
+			       :limit 1 :flatp t
 			       :where [= [testtime] time] ))
 	(values (iso-timestring (parse-timestring testtime))
 		(iso-timestring (parse-timestring testtimetz))))))
@@ -408,7 +409,7 @@
        (make-instance 'datetest :testtimetz time :testtime time))
       (let ((o (first (clsql:select
 			  'datetest
-			:limit 1 :flatp T
+			:limit 1 :flatp t
 			:where [= [testtime] time] ))))
 	(assert o (o) "o shouldnt be null here (we should have just inserted)")
 	(update-records-from-instance o)
@@ -425,7 +426,7 @@
 	 (make-instance 'datetest :testtimetz time :testtime time))
 	(let ((o (first (clsql:select
 			 'datetest
-			 :limit 1 :flatp T
+			 :limit 1 :flatp t
 			 :where [= [testtime] time] ))))
 	  (assert o (o) "o shouldnt be null here (we should have just inserted)")
 	  (update-records-from-instance o)