kritphong
/
ssql
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

make `merge-clause' a proper method

Browse Source
master
Moritz Heidkamp 15 years ago
parent 9fde24d7b5
commit e7e17baf47
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File

13
ssql.scm
Unescape Escape View File

@ -126,7 +126,10 @@
(cond ((null? ssql) (list clause)) (cond ((null? ssql) (list clause))
((before? (car clause) (caar ssql) order) ((before? (car clause) (caar ssql) order)
(cons clause ssql)) (cons clause ssql))
(else (cons (car ssql) (loop (cdr ssql)))))))))) (else (cons (car ssql) (loop (cdr ssql))))))))
((merge-clauses target-clause clause)
(append target-clause (cdr clause)))))
(define-operators *ansi-translator* (define-operators *ansi-translator*
(select prefix) (select prefix)
@ -265,9 +268,11 @@
(lambda (engine) (lambda (engine)
(cons (car ssql) (cons (car ssql)
(fold-right (lambda (clause ssql) (fold-right (lambda (clause ssql)
(let ((target (alist-ref (car clause) ssql))) (let ((target-clause (alist-ref (car clause) ssql)))
(if target (if target-clause
(alist-update! (car clause) (append target (cdr clause)) ssql) (alist-update! (car clause)
(engine 'merge-clauses target-clause clause)
ssql)
(engine 'insert-clause clause ssql)))) (engine 'insert-clause clause ssql))))
(cdr ssql) (cdr ssql)
clauses))))) clauses)))))

Write Preview
Loading…
Cancel
Save