From 995f320918002fadb484e11c01e2cfd9d1a81235 Mon Sep 17 00:00:00 2001 From: Ryan Culpepper Date: Sat, 15 Apr 2017 12:19:31 -0400 Subject: [PATCH] fix in-query result checks with grouping closes racket/db#8 merge to release branch --- racket/collects/db/private/generic/functions.rkt | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/racket/collects/db/private/generic/functions.rkt b/racket/collects/db/private/generic/functions.rkt index 16e3fc4be3..6e0171a191 100644 --- a/racket/collects/db/private/generic/functions.rkt +++ b/racket/collects/db/private/generic/functions.rkt @@ -247,18 +247,17 @@ (let* ([check ;; If grouping, can't check expected arity. ;; FIXME: should check header includes named fields - (cond [(null? grouping-fields) (or vars 'rows)] - [else 'rows])] - [stmt (compose-statement 'in-query c stmt args check)]) + (if (null? grouping-fields) vars #f)] + [stmt (compose-statement 'in-query c stmt args (or check 'rows))]) (cond [(eqv? fetch-size +inf.0) (in-list/vector->values (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) result (group-rows-result* 'in-query result grouping-fields group-mode)))))] [else - (let ([cursor (query/cursor c 'in-query stmt vars)]) + (let ([cursor (query/cursor c 'in-query stmt check)]) (in-list-generator/vector->values (lambda () (send c fetch/cursor 'in-query cursor fetch-size))))])))