projects
/
clsql.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r9415: fix for cerror
[clsql.git]
/
sql
/
loop-extension.lisp
diff --git
a/sql/loop-extension.lisp
b/sql/loop-extension.lisp
index d0f816f37da0192eadea3cdb3c5f2c35a68918a1..db1cfb62bcda7b67715760b6b8437fe6f4179edd 100644
(file)
--- a/
sql/loop-extension.lisp
+++ b/
sql/loop-extension.lisp
@@
-16,7
+16,6
@@
(eval-when (:compile-toplevel :load-toplevel :execute)
(defpackage #:ansi-loop
(:import-from #+sbcl #:sb-loop #+allegro #:excl
(eval-when (:compile-toplevel :load-toplevel :execute)
(defpackage #:ansi-loop
(:import-from #+sbcl #:sb-loop #+allegro #:excl
- #:loop-error
#:*loop-epilogue*
#:*loop-ansi-universe*
#:add-loop-path)))
#:*loop-epilogue*
#:*loop-ansi-universe*
#:add-loop-path)))
@@
-34,21
+33,29
@@
(case prep
((:in :of)
(when in-phrase
(case prep
((:in :of)
(when in-phrase
- (ansi-loop::loop-error
- "Duplicate OF or IN iteration path: ~S." (cons prep rest)))
+ (error 'clsql:sql-user-error
+ :message
+ (format nil
+ "Duplicate OF or IN iteration path: ~S."
+ (cons prep rest))))
(setq in-phrase rest))
((:from)
(when from-phrase
(setq in-phrase rest))
((:from)
(when from-phrase
- (ansi-loop::loop-error
- "Duplicate FROM iteration path: ~S." (cons prep rest)))
+ (error 'clsql:sql-user-error
+ :message
+ (format nil
+ "Duplicate FROM iteration path: ~S."
+ (cons prep rest))))
(setq from-phrase rest))
(t
(setq from-phrase rest))
(t
- (ansi-loop::loop-error
- "Unknown preposition: ~S." prep))))
+ (error 'clsql:sql-user-error
+ :message
+ (format nil"Unknown preposition: ~S." prep)))))
(unless in-phrase
(unless in-phrase
- (ansi-loop::loop-error "Missing OF or IN iteration path."))
+ (error 'clsql:sql-user-error
+ :message "Missing OF or IN iteration path."))
(unless from-phrase
(unless from-phrase
- (setq from-phrase '(clsql:*default-database*)))
+ (setq from-phrase '(clsql
-sys
:*default-database*)))
(unless (consp variable)
(setq variable (list variable)))
(unless (consp variable)
(setq variable (list variable)))
@@
-65,7
+72,7
@@
'loop-record-result-))
(step-var (ansi-loop::loop-gentemp 'loop-record-step-)))
`(((,variable nil ,@(and data-type (list data-type)))
'loop-record-result-))
(step-var (ansi-loop::loop-gentemp 'loop-record-step-)))
`(((,variable nil ,@(and data-type (list data-type)))
- (,result-var (clsql:query ,(first in-phrase)))
+ (,result-var (clsql
-sys
:query ,(first in-phrase)))
(,step-var nil))
()
()
(,step-var nil))
()
()
@@
-94,7
+101,7
@@
'loop-record-result-set-))
(step-var (ansi-loop::loop-gentemp 'loop-record-step-)))
(push `(when ,result-set-var
'loop-record-result-set-))
(step-var (ansi-loop::loop-gentemp 'loop-record-step-)))
(push `(when ,result-set-var
- (clsql:database-dump-result-set ,result-set-var ,db-var))
+ (clsql
-sys
:database-dump-result-set ,result-set-var ,db-var))
ansi-loop::*loop-epilogue*)
`(((,variable nil ,@(and data-type (list data-type)))
(,query-var ,(first in-phrase))
ansi-loop::*loop-epilogue*)
`(((,variable nil ,@(and data-type (list data-type)))
(,query-var ,(first in-phrase))
@@
-102,15
+109,15
@@
(,result-set-var nil)
(,step-var nil))
((multiple-value-bind (%rs %cols)
(,result-set-var nil)
(,step-var nil))
((multiple-value-bind (%rs %cols)
- (clsql:database-query-result-set ,query-var ,db-var :result-types :auto)
+ (clsql
-sys
:database-query-result-set ,query-var ,db-var :result-types :auto)
(setq ,result-set-var %rs ,step-var (make-list %cols))))
()
()
(setq ,result-set-var %rs ,step-var (make-list %cols))))
()
()
- (not (clsql:database-store-next-row ,result-set-var ,db-var ,step-var))
+ (not (clsql
-sys
:database-store-next-row ,result-set-var ,db-var ,step-var))
(,variable ,step-var)
(not ,result-set-var)
()
(,variable ,step-var)
(not ,result-set-var)
()
- (not (clsql:database-store-next-row ,result-set-var ,db-var ,step-var))
+ (not (clsql
-sys
:database-store-next-row ,result-set-var ,db-var ,step-var))
(,variable ,step-var)))))))
#+(or cmu scl sbcl openmcl allegro)
(,variable ,step-var)))))))
#+(or cmu scl sbcl openmcl allegro)
@@
-140,19
+147,24
@@
(cond
((or (eq prep 'in) (eq prep 'of))
(when in-phrase
(cond
((or (eq prep 'in) (eq prep 'of))
(when in-phrase
- (error
- "Duplicate OF or IN iteration path: ~S." (cons prep rest)))
+ (error 'clsql:sql-user-error
+ :message
+ (format nil "Duplicate OF or IN iteration path: ~S."
+ (cons prep rest))))
(setq in-phrase rest))
((eq prep 'from)
(when from-phrase
(setq in-phrase rest))
((eq prep 'from)
(when from-phrase
- (error
- "Duplicate FROM iteration path: ~S." (cons prep rest)))
+ (error 'clsql:sql-user-error
+ :message
+ (format nil "Duplicate FROM iteration path: ~S."
+ (cons prep rest))))
(setq from-phrase rest))
(t
(setq from-phrase rest))
(t
- (error
-
"Unknown preposition: ~S." prep
))))
+ (error
'clsql:sql-user-error
+
:message (format nil "Unknown preposition: ~S." prep)
))))
(unless in-phrase
(unless in-phrase
- (error "Missing OF or IN iteration path."))
+ (error 'clsql:sql-user-error
+ :message "Missing OF or IN iteration path."))
(unless from-phrase
(setq from-phrase '(clsql:*default-database*)))
(unless from-phrase
(setq from-phrase '(clsql:*default-database*)))
@@
-210,18
+222,18
@@
(,result-set-var nil)
(,step-var nil))
`((multiple-value-bind (%rs %cols)
(,result-set-var nil)
(,step-var nil))
`((multiple-value-bind (%rs %cols)
- (clsql:database-query-result-set ,query-var ,db-var :result-types :auto)
+ (clsql
-sys
:database-query-result-set ,query-var ,db-var :result-types :auto)
(setq ,result-set-var %rs ,step-var (make-list %cols))))
()
()
(setq ,result-set-var %rs ,step-var (make-list %cols))))
()
()
- `((unless (clsql:database-store-next-row ,result-set-var ,db-var ,step-var)
+ `((unless (clsql
-sys
:database-store-next-row ,result-set-var ,db-var ,step-var)
(when ,result-set-var
(when ,result-set-var
- (clsql:database-dump-result-set ,result-set-var ,db-var))
+ (clsql
-sys
:database-dump-result-set ,result-set-var ,db-var))
t))
`(,iter-var ,step-var)
t))
`(,iter-var ,step-var)
- `((unless (clsql:database-store-next-row ,result-set-var ,db-var ,step-var)
+ `((unless (clsql
-sys
:database-store-next-row ,result-set-var ,db-var ,step-var)
(when ,result-set-var
(when ,result-set-var
- (clsql:database-dump-result-set ,result-set-var ,db-var))
+ (clsql
-sys
:database-dump-result-set ,result-set-var ,db-var))
t))
`(,iter-var ,step-var)
()
t))
`(,iter-var ,step-var)
()