From: Kevin M. Rosenberg <kevin@rosenberg.net>
Date: Tue, 25 Oct 2005 16:16:43 +0000 (+0000)
Subject: r10789: Automated commit for Debian build of clsql upstream-version-3.3.1
X-Git-Tag: v3.8.6~114
X-Git-Url: http://git.kpe.io/?p=clsql.git;a=commitdiff_plain;h=e11daa653dbf4bdb74068995b79c22ad42325aa5

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

diff --git a/ChangeLog b/ChangeLog
index e95d31a..1092414 100644
--- 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 6fc0f03..1e2b768 100644
--- 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 0f8d5e2..95a7a68 100644
--- 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