git.iko.soy/rel8
on master help sign in
Change arguments to listAggWithOrder
commit26ccab33c8a0966bb2ec9c8f3e8aef27f84caa74 authorShane O'Brien <shane.obrien@circuithub.com> dateFri 23 Apr 2021, 11:22 (6 years ago) parent5160431
2 files changed+14−14
compare with master
unifiedsplit
src/Rel8/Expr/Aggregate.hs+4−4 src/Rel8/Table/Aggregate.hs+10−10
src/Rel8/Expr/Aggregate.hs+4−4
@@ -189,8 +189,8 @@ nonEmptyAggExpr = unsafeMakeAggregate toPrimExpr from $ Just
189189 from = fromPrimExpr . fromPrimArray
190190
191191
192−listAggExprWithOrder :: o -> Order o -> Expr a -> Aggregate (Expr [a])
193−listAggExprWithOrder o order = unsafeMakeAggregate toPrimExpr from $ Just
192+listAggExprWithOrder :: Order o -> o -> Expr a -> Aggregate (Expr [a])
193+listAggExprWithOrder order o = unsafeMakeAggregate toPrimExpr from $ Just
194194 Aggregator
195195 { operation = Opaleye.AggrArr
196196 , ordering = toOrderExprs order o
@@ -201,8 +201,8 @@ listAggExprWithOrder o order = unsafeMakeAggregate toPrimExpr from $ Just
201201
202202
203203nonEmptyAggExprWithOrder :: ()
204− => o -> Order o -> Expr a -> Aggregate (Expr (NonEmpty a))
205−nonEmptyAggExprWithOrder o order = unsafeMakeAggregate toPrimExpr from $ Just
204+ => Order o -> o -> Expr a -> Aggregate (Expr (NonEmpty a))
205+nonEmptyAggExprWithOrder order o = unsafeMakeAggregate toPrimExpr from $ Just
206206 Aggregator
207207 { operation = Opaleye.AggrArr
208208 , ordering = toOrderExprs order o
src/Rel8/Table/Aggregate.hs+10−10
@@ -75,17 +75,17 @@ nonEmptyAgg (toColumns -> exprs) = fromColumns $
7575 (pure exprs)
7676
7777
78−listAggWithOrder :: Table Expr b
79− => (a -> o) -> (a -> b) -> Order o -> a -> Aggregate (ListTable b)
80−listAggWithOrder o b order a = fromColumns $
78+listAggWithOrder :: Table Expr a
79+ => Order o -> o -> a -> Aggregate (ListTable a)
80+listAggWithOrder order o (toColumns -> exprs) = fromColumns $
8181 hvectorize
82− (\_ (Identity (DB x)) -> Aggregation $ listAggExprWithOrder (o a) order x)
83− (pure (toColumns (b a)))
82+ (\_ (Identity (DB x)) -> Aggregation $ listAggExprWithOrder order o x)
83+ (pure exprs)
8484
8585
86−nonEmptyAggWithOrder :: Table Expr b
87− => (a -> o) -> (a -> b) -> Order o -> a -> Aggregate (NonEmptyTable b)
88−nonEmptyAggWithOrder o b order a = fromColumns $
86+nonEmptyAggWithOrder :: Table Expr a
87+ => Order o -> o -> a -> Aggregate (NonEmptyTable a)
88+nonEmptyAggWithOrder order o (toColumns -> exprs) = fromColumns $
8989 hvectorize
90− (\_ (Identity (DB x)) -> Aggregation $ nonEmptyAggExprWithOrder (o a) order x)
91− (pure (toColumns (b a)))
90+ (\_ (Identity (DB x)) -> Aggregation $ nonEmptyAggExprWithOrder order o x)
91+ (pure exprs)