Use lower case symbols for compatibility with "modern"-mode AllegroCL

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

diff --git a/tests/test-time.lisp b/tests/test-time.lisp
index 5d2e2e580992bc2cc3a24a912ce751532ee842e0..47f07095caff03613d475a5a9cf7ba6021925ec7 100644 (file)
--- a/tests/test-time.lisp
+++ b/tests/test-time.lisp
@@ -9,18 +9,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")))
+e  ((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)))
@@ -69,6 +71,25 @@
       (decode-time time1))
   3 32 56 14 23 1 2010 6)
 
+(deftest :time/print-parse/1
+    ;;make sure when we print and parse we get the same time.
+    (let* ((time (clsql-sys:make-time :year 2010 :month 1 :day 4
+                                     :hour 14 :minute 15 :second 44))
+          (string-time (iso-timestring time))
+          (time2 (parse-timestring string-time)))
+      (decode-time time2))
+  0 44 15 14 4 1 2010 1)
+
+(deftest :time/print-parse/2
+    ;;make sure when we print and parse we get the same time.
+    (let* ((time (clsql-sys:make-time :year 2010 :month 1 :day 4
+                                     :hour 14 :minute 15 :second 44 :usec 3))
+          (string-time (iso-timestring time))
+          (time2 (parse-timestring string-time)))
+      (decode-time time2))
+  3 44 15 14 4 1 2010 1)
+
+
 ;; relations of intervals
 (deftest :time/1
     (let* ((time-1 (clsql:parse-timestring "2002-01-01 10:00:00"))
@@ -273,17 +294,6 @@
   t)
 
 
-(deftest :time/14-usec
-    ;;make sure when we print and parse we get the same time.
-    (let* ((time (clsql-sys:make-time :year 2010 :month 1 :day 4
-                                     :hour 14 :minute 15 :second 44 :usec 3))
-          (string-time (clsql-sys:format-time nil time :format :iso))
-          (time2 (clsql-sys:parse-timestring string-time)))
-      (format-time nil time2 :format :iso))
-  #.(format-time nil (clsql-sys:make-time :year 2010 :month 1 :day 4
-                                     :hour 14 :minute 15 :second 44 :usec 3)
-     :format :iso))
-
 
 ;;; The cross platform dataset uses the 'timestamp' column type which is
 ;;; in sql-92, for all that means.
@@ -316,6 +326,22 @@
          )))
   #.(format-time nil (parse-timestring "2008-09-09T14:37:29-04:00") :format :iso))
 
+;;;This test gets at the databases that only support miliseconds,
+;;; not microseconds.
+(deftest :time/cross-platform/msec
+    (with-dataset *cross-platform-datetest*
+      (let ((time (parse-timestring "2008-09-09T14:37:29.423")))
+       (clsql-sys:insert-records :into [datetest]
+                                 :attributes '([testtime])
+                                 :values (list time))
+       (let ((testtime
+              (first (clsql:select [testtime]
+                                   :from [datetest] :flatp T
+                                   :where [= [testtime] time] ))))
+         (format-time nil (parse-timestring testtime) :format :iso)
+         )))
+  #.(format-time nil (parse-timestring "2008-09-09T14:37:29.423") :format :iso))
+
 (deftest :time/cross-platform/usec/no-tz
     (with-dataset *cross-platform-datetest*
       (let ((time (parse-timestring "2008-09-09T14:37:29.000213")))