r10789: Automated commit for Debian build of clsql upstream-version-3.3.1

diff --git a/ChangeLog b/ChangeLog
index e95d31a4b8b1acaf3ec315633d7e7302886c64bf..1092414f2c500f58844b88077417aad7e0614abd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+25 Oct 2005  Kevin Rosenberg <kevin@rosenberg.net>
+       * Version 3.3.1
+       * sql/time.lisp: Commit patch from Alan Shields to
+       display escape string on wall-time display only when *print-escape*
+       is true.
+       
 11 Oct 2005  Kevin Rosenberg <kevin@rosenberg.net>
        * sql/metaclasses.lisp: Commit patch from Will to
        properly set db-reader slot in effective-slot-definition

diff --git a/debian/changelog b/debian/changelog
index 6fc0f032598fc613334670befa3ba93f883cace1..1e2b76827f27470132aba3229f04058bf81c0f0e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cl-sql (3.3.1-1) unstable; urgency=low
+
+  * New upstream
+
+ -- Kevin M. Rosenberg <kmr@debian.org>  Tue, 25 Oct 2005 10:16:34 -0600
+
 cl-sql (3.3.0-1) unstable; urgency=low
 
   * New upstream

diff --git a/sql/time.lisp b/sql/time.lisp
index 0f8d5e235f0e75ad6fc4fd7787aacf8b721f35c9..95a7a683de6d7caa9bb0a154493419ab8b64dcfd 100644 (file)
--- a/sql/time.lisp
+++ b/sql/time.lisp
@@ -67,7 +67,9 @@
 
 (defun %print-wall-time (time stream depth)
   (declare (ignore depth))
-  (format stream "#<WALL-TIME: ~a>" (format-time nil time)))
+  (if *print-escape*
+      (format stream "#<WALL-TIME: ~a>" (format-time nil time))
+      (format-time stream time :format :pretty)))
 
 (defstruct (duration (:constructor %make-duration)
                      (:print-function %print-duration))
@@ -81,8 +83,10 @@
 
 (defun %print-duration (duration stream depth)
   (declare (ignore depth))
-  (format stream "#<DURATION: ~a>"
-          (format-duration nil duration :precision :second)))
+  (if *print-escape*
+      (format stream "#<DURATION: ~a>"
+             (format-duration nil duration :precision :second))
+      (format-duration stream duration :precision :second)))
 
 (defstruct (date (:constructor %make-date)
                 (:print-function %print-date))
@@ -90,7 +94,9 @@
 
 (defun %print-date (date stream depth)
   (declare (ignore depth))
-  (format stream "#<DATE: ~a>" (format-date nil date)))
+  (if *print-escape*
+      (format stream "#<DATE: ~a>" (format-date nil date))
+      (format-date stream date :format :pretty)))
 
 );eval-when