* Version 3.4.7
* sql/time.lisp: Commit patch from Aleksandar Bakic for
correct handling of decode-time usec value
* clsql-mysql.asd: Commit patch from Harald Hanche-Olsen to
correct the name of the shared library file.
+24 Nov 2005 Kevin Rosenberg <kevin@rosenberg.net>
+ * Version 3.4.7
+ * sql/time.lisp: Commit patch from Aleksandar Bakic for
+ correct handling of decode-time usec value
+ * clsql-mysql.asd: Commit patch from Harald Hanche-Olsen to
+ correct the name of the shared library file.
+
16 Nov 2005 Kevin Rosenberg <kevin@rosenberg.net>
* version 3.4.6
* sql/metaclasses.lisp: Avoid calling change-class on
16 Nov 2005 Kevin Rosenberg <kevin@rosenberg.net>
* version 3.4.6
* sql/metaclasses.lisp: Avoid calling change-class on
((:module :db-mysql
:components
((:file "mysql-package")
((:module :db-mysql
:components
((:file "mysql-package")
- (:clsql-mysql-source-file "mysql" :depends-on ("mysql-package"))
- (:file "mysql-loader" :depends-on ("mysql-package" "mysql"))
+ (:clsql-mysql-source-file "clsql_mysql" :depends-on ("mysql-package"))
+ (:file "mysql-loader" :depends-on ("mysql-package" "clsql_mysql"))
(:file "mysql-client-info" :depends-on ("mysql-loader"))
(:file "mysql-api" :depends-on ("mysql-client-info"))
(:file "mysql-sql" :depends-on ("mysql-api"))
(:file "mysql-client-info" :depends-on ("mysql-loader"))
(:file "mysql-api" :depends-on ("mysql-client-info"))
(:file "mysql-sql" :depends-on ("mysql-api"))
+cl-sql (3.4.7-1) unstable; urgency=low
+
+ * New upstream
+
+ -- Kevin M. Rosenberg <kmr@debian.org> Fri, 25 Nov 2005 10:41:34 -0700
+
cl-sql (3.4.6-1) unstable; urgency=low
* New upstream
cl-sql (3.4.6-1) unstable; urgency=low
* New upstream
(defun duration<= (duration-a duration-b)
(<= (duration-reduce duration-a :usec)
(duration-reduce duration-b :usec)))
(defun duration<= (duration-a duration-b)
(<= (duration-reduce duration-a :usec)
(duration-reduce duration-b :usec)))
(defun duration>= (x y)
(duration<= y x))
(defun duration>= (x y)
(duration<= y x))
(if (/= (time-second x) (time-second y))
(< (time-second x) (time-second y))
(< (time-usec x) (time-usec y))))))
(if (/= (time-second x) (time-second y))
(< (time-second x) (time-second y))
(< (time-usec x) (time-usec y))))))
(defun %time>= (x y)
(if (/= (time-mjd x) (time-mjd y))
(>= (time-mjd x) (time-mjd y))
(defun %time>= (x y)
(if (/= (time-mjd x) (time-mjd y))
(>= (time-mjd x) (time-mjd y))
(defstruct interval
(start nil)
(end nil)
(defstruct interval
(start nil)
(end nil)
(contained nil)
(type nil)
(data nil))
(contained nil)
(type nil)
(data nil))
(append sorted-list (list interval))))
;; interval lists
(append sorted-list (list interval))))
;; interval lists
(defun interval-match (list time)
"Return the index of the first interval in list containing time"
;; this depends on ordering of intervals!
(defun interval-match (list time)
"Return the index of the first interval in list containing time"
;; this depends on ordering of intervals!
- (let ((list (sort-interval-list list)))
+ (let ((list (sort-interval-list list)))
(dotimes (x (length list))
(let ((elt (nth x list)))
(when (and (time<= (interval-start elt) time)
(time< time (interval-end elt)))
(return-from interval-match x))))))
(dotimes (x (length list))
(let ((elt (nth x list)))
(when (and (time<= (interval-start elt) time)
(time< time (interval-end elt)))
(return-from interval-match x))))))
(defun interval-clear (list time)
(dotimes (x (length list))
(let ((elt (nth x list)))
(defun interval-clear (list time)
(dotimes (x (length list))
(let ((elt (nth x list)))
"Attempts to modify the most deeply nested interval in list which
begins at time. If no changes are made, returns nil."
;; function required sorted interval list
"Attempts to modify the most deeply nested interval in list which
begins at time. If no changes are made, returns nil."
;; function required sorted interval list
- (let ((list (sort-interval-list list)))
+ (let ((list (sort-interval-list list)))
(if (null list) nil
(dotimes (x (length list))
(let ((elt (nth x list)))
(if (null list) nil
(dotimes (x (length list))
(let ((elt (nth x list)))
"Returns a DURATION representing the difference between TIME1 and
TIME2."
(flet ((do-diff (time1 time2)
"Returns a DURATION representing the difference between TIME1 and
TIME2."
(flet ((do-diff (time1 time2)
(let (day-diff sec-diff)
(setf day-diff (- (time-mjd time2)
(time-mjd time1)))
(let (day-diff sec-diff)
(setf day-diff (- (time-mjd time2)
(time-mjd time1)))
year date-separator month date-separator day
internal-separator hour time-separator minute time-separator
second usec))))))
year date-separator month date-separator day
internal-separator hour time-separator minute time-separator
second usec))))))
(defun pretty-time (hour minute)
(cond
((eq hour 0)
(defun pretty-time (hour minute)
(cond
((eq hour 0)
(push (subseq input start x) output)
(setf start (1+ x))))
(nreverse (push (subseq input start) output))))
(push (subseq input start x) output)
(setf start (1+ x))))
(nreverse (push (subseq input start) output))))
(defun merged-time (day time-of-day)
(%make-wall-time :mjd (time-mjd day)
:second (time-second time-of-day)))
(defun merged-time (day time-of-day)
(%make-wall-time :mjd (time-mjd day)
:second (time-second time-of-day)))
(print-date time style)))
(defun print-date (time &optional (style :daytime))
(print-date time style)))
(defun print-date (time &optional (style :daytime))
- (multiple-value-bind (second minute hour day month year dow)
+ (multiple-value-bind (usec second minute hour day month year dow)
- (declare (ignore second))
+ (declare (ignore usec second))
(multiple-value-bind (hours meridian)
(time-meridian hour)
(ecase style
(multiple-value-bind (hours meridian)
(time-meridian hour)
(ecase style
(format nil "~d/~d/~d" month day year))))))
(defun time-element (time element)
(format nil "~d/~d/~d" month day year))))))
(defun time-element (time element)
- (multiple-value-bind (second minute hour day month year dow)
+ (multiple-value-bind (usec second minute hour day month year dow)
+ (declare (ignore usec))
(ecase element
(:seconds
second)
(ecase element
(:seconds
second)
doy))
(defun parse-yearstring (string)
doy))
(defun parse-yearstring (string)
- (let ((year (or (parse-integer-insensitively string)
+ (let ((year (or (parse-integer-insensitively string)
(extract-roman string))))
(when (and year (< 1500 year 2500))
(make-time :year year))))
(extract-roman string))))
(when (and year (< 1500 year 2500))
(make-time :year year))))
;; ------------------------------------------------------------
;; ------------------------------------------------------------
-;; Parsing iso-8601 timestrings
+;; Parsing iso-8601 timestrings
(define-condition iso-8601-syntax-error (sql-user-error)
((bad-component;; year, month whatever
(define-condition iso-8601-syntax-error (sql-user-error)
((bad-component;; year, month whatever
"parse a timestring and return the corresponding wall-time. If the
timestring starts with P, read a duration; otherwise read an ISO 8601
formatted date string."
"parse a timestring and return the corresponding wall-time. If the
timestring starts with P, read a duration; otherwise read an ISO 8601
formatted date string."
- (declare (ignore junk-allowed))
+ (declare (ignore junk-allowed))
(let ((string (subseq timestring start end)))
(if (char= (aref string 0) #\P)
(parse-iso-8601-duration string)
(let ((string (subseq timestring start end)))
(if (char= (aref string 0) #\P)
(parse-iso-8601-duration string)