From: Kevin M. Rosenberg Date: Fri, 9 Apr 2004 14:08:05 +0000 (+0000) Subject: r8908: all tests pass on all platforms X-Git-Tag: v3.8.6~690 X-Git-Url: http://git.kpe.io/?p=clsql.git;a=commitdiff_plain;h=41b951fca5ef48b594ca316cf1253b4d1192a045 r8908: all tests pass on all platforms --- diff --git a/ChangeLog b/ChangeLog index e7b049f..e54a205 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +09 Apr 2004 Kevin Rosenberg (kevin@rosenberg.net) + * Version 2.5.0 released: + All tests for CLSQL and CLSQL-CLASSIC pass + on all platforms. + * base/loop-extension.lisp: Add Lispworks + loop-extension. Improve type specifying on + other platforms. + 09 Apr 2004 Kevin Rosenberg (kevin@rosenberg.net) * Version 2.4.2 released: loop extension now supported on Allegro, all diff --git a/TODO b/TODO index 226c26f..d6950a6 100644 --- a/TODO +++ b/TODO @@ -49,10 +49,6 @@ COMMONSQL SPEC LIST-ATTRIBUTE-TYPES o should return list of (attribute datatype precision scale nullable) - LOOP - o Port to lispworks. Potentially useful documentation: - http://www.lispworks.com/reference/lcl50/loop/loop-52.html - >> The object-oriented sql interface diff --git a/base/loop-extension.lisp b/base/loop-extension.lisp index 2290f27..76010e4 100644 --- a/base/loop-extension.lisp +++ b/base/loop-extension.lisp @@ -84,9 +84,10 @@ 'loop-record-result-set-)) (step-var (ansi-loop::loop-gentemp 'loop-record-step-))) (push `(when ,result-set-var - (clsql-base-sys:database-dump-result-set ,result-set-var ,db-var)) + (clsql-base-sys:database-dump-result-set ,result-set-var ,db-var)) ansi-loop::*loop-epilogue*) - `(((,variable nil ,data-type) (,query-var ,(first in-phrase)) + `(((,variable nil ,@(and data-type (list data-type))) + (,query-var ,(first in-phrase)) (,db-var ,(first from-phrase)) (,result-set-var nil) (,step-var nil)) @@ -109,7 +110,8 @@ (push `(when ,result-set-var (clsql-base-sys:database-dump-result-set ,result-set-var ,db-var)) ansi-loop::*loop-epilogue*) - `(((,variable nil ,data-type) (,query-var ,(first in-phrase)) + `(((,variable nil ,@(and data-type (list data-type))) + (,query-var ,(first in-phrase)) (,db-var ,(first from-phrase)) (,result-set-var nil)) ((multiple-value-bind (%rs %cols) @@ -169,48 +171,57 @@ (result-set-var (ansi-loop::loop-gentemp 'loop-record-result-set-)) (step-var (ansi-loop::loop-gentemp 'loop-record-step-))) - #+ignore - (push `(when ,result-set-var - (clsql-base-sys:database-dump-result-set ,result-set-var ,db-var)) - ansi-loop::*epilogue*) - `(((,iter-var nil ,iter-var-data-type) (,query-var ,(first in-phrase)) + (values + t + nil + `(,@(mapcar (lambda (v) `(,v nil)) iter-var) + (,query-var ,in-phrase) (,db-var ,(first from-phrase)) (,result-set-var nil) (,step-var nil)) - ((multiple-value-bind (%rs %cols) + `((multiple-value-bind (%rs %cols) (clsql-base-sys:database-query-result-set ,query-var ,db-var) (setq ,result-set-var %rs ,step-var (make-list %cols)))) - () - () - (not (clsql-base-sys:database-store-next-row ,result-set-var ,db-var ,step-var)) - (,iter-var ,step-var) - (not ,result-set-var) - () - (not (clsql-base-sys:database-store-next-row ,result-set-var ,db-var ,step-var)) - (,iter-var ,step-var)))) + () + () + `((unless (clsql-base-sys:database-store-next-row ,result-set-var ,db-var ,step-var) + (when ,result-set-var + (clsql-base-sys:database-dump-result-set ,result-set-var ,db-var)) + t)) + `(,iter-var ,step-var) + `((unless (clsql-base-sys:database-store-next-row ,result-set-var ,db-var ,step-var) + (when ,result-set-var + (clsql-base-sys:database-dump-result-set ,result-set-var ,db-var)) + t)) + `(,iter-var ,step-var) + () + ()))) (t (let ((query-var (ansi-loop::loop-gentemp 'loop-record-)) (db-var (ansi-loop::loop-gentemp 'loop-record-database-)) (result-set-var (ansi-loop::loop-gentemp 'loop-record-result-set-))) - #+ignore - (push `(when ,result-set-var - (clsql-base-sys:database-dump-result-set ,result-set-var ,db-var)) - ansi-loop::*epilogue*) - `(((,iter-var nil ,iter-var-data-type) (,query-var ,(first in-phrase)) + (values + t + nil + `((,iter-var nil ,iter-var-data-type) (,query-var ,in-phrase) (,db-var ,(first from-phrase)) (,result-set-var nil)) - ((multiple-value-bind (%rs %cols) + `((multiple-value-bind (%rs %cols) (clsql-base-sys:database-query-result-set ,query-var ,db-var) (setq ,result-set-var %rs ,iter-var (make-list %cols)))) + () + () + `((unless (clsql-base-sys:database-store-next-row ,result-set-var ,db-var ,iter-var) + (when ,result-set-var + (clsql-base-sys:database-dump-result-set ,result-set-var ,db-var)) + t)) () - () - (not (clsql-base-sys:database-store-next-row ,result-set-var ,db-var ,iter-var)) - () - (not ,result-set-var) - () - (not (clsql-base-sys:database-store-next-row ,result-set-var ,db-var ,iter-var)) - ())))))) - - + `((unless (clsql-base-sys:database-store-next-row ,result-set-var ,db-var ,iter-var) + (when ,result-set-var + (clsql-base-sys:database-dump-result-set ,result-set-var ,db-var)) + t)) + () + () + ())))))) diff --git a/debian/changelog b/debian/changelog index 4a46cdd..c230cd6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +cl-sql (2.5.0-1) unstable; urgency=low + + * New upstream + + -- Kevin M. Rosenberg Fri, 9 Apr 2004 08:07:00 -0600 + cl-sql (2.4.2-1) unstable; urgency=low * New upstream