suzanne.soy/racket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix in-query result checks with grouping

Browse Source 
closes racket/db#8

merge to release branch
This commit is contained in:
Ryan Culpepper 2017-04-15 12:19:31 -04:00
parent 922b5f06e9
commit 995f320918
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
racket/collects/db/private/generic/functions.rkt
View File

@ -247,18 +247,17 @@
(let* ([check (let* ([check
;; If grouping, can't check expected arity. ;; If grouping, can't check expected arity.
;; FIXME: should check header includes named fields ;; FIXME: should check header includes named fields
(cond [(null? grouping-fields) (or vars 'rows)] (if (null? grouping-fields) vars #f)]
[else 'rows])] [stmt (compose-statement 'in-query c stmt args (or check 'rows))])
[stmt (compose-statement 'in-query c stmt args check)])
(cond [(eqv? fetch-size +inf.0) (cond [(eqv? fetch-size +inf.0)
(in-list/vector->values (in-list/vector->values
(rows-result-rows (rows-result-rows
(let ([result (query/rows c 'in-query stmt vars)]) (let ([result (query/rows c 'in-query stmt check)])
(if (null? grouping-fields) (if (null? grouping-fields)
result result
(group-rows-result* 'in-query result grouping-fields group-mode)))))] (group-rows-result* 'in-query result grouping-fields group-mode)))))]
[else [else
(let ([cursor (query/cursor c 'in-query stmt vars)]) (let ([cursor (query/cursor c 'in-query stmt check)])
(in-list-generator/vector->values (in-list-generator/vector->values
(lambda () (send c fetch/cursor 'in-query cursor fetch-size))))]))) (lambda () (send c fetch/cursor 'in-query cursor fetch-size))))])))