git.iko.soy/rel8
on master help sign in
Change arguments to listAggWithOrder
26ccab3Shane O'Brien
src/Rel8/Expr/Aggregate.hs+4−4
compare with master
unifiedsplit
@@ -189,8 +189,8 @@ nonEmptyAggExpr = unsafeMakeAggregate toPrimExpr from $ Just
189 from = fromPrimExpr . fromPrimArray
189 from = fromPrimExpr . fromPrimArray
190
190
191
191
192−listAggExprWithOrder :: o -> Order o -> Expr a -> Aggregate (Expr [a])
192+listAggExprWithOrder :: Order o -> o -> Expr a -> Aggregate (Expr [a])
193−listAggExprWithOrder o order = unsafeMakeAggregate toPrimExpr from $ Just
193+listAggExprWithOrder order o = unsafeMakeAggregate toPrimExpr from $ Just
194 Aggregator
194 Aggregator
195 { operation = Opaleye.AggrArr
195 { operation = Opaleye.AggrArr
196 , ordering = toOrderExprs order o
196 , ordering = toOrderExprs order o
@@ -201,8 +201,8 @@ listAggExprWithOrder o order = unsafeMakeAggregate toPrimExpr from $ Just
201
201
202
202
203nonEmptyAggExprWithOrder :: ()
203nonEmptyAggExprWithOrder :: ()
204− => o -> Order o -> Expr a -> Aggregate (Expr (NonEmpty a))
204+ => Order o -> o -> Expr a -> Aggregate (Expr (NonEmpty a))
205−nonEmptyAggExprWithOrder o order = unsafeMakeAggregate toPrimExpr from $ Just
205+nonEmptyAggExprWithOrder order o = unsafeMakeAggregate toPrimExpr from $ Just
206 Aggregator
206 Aggregator
207 { operation = Opaleye.AggrArr
207 { operation = Opaleye.AggrArr
208 , ordering = toOrderExprs order o
208 , ordering = toOrderExprs order o
src/Rel8/Table/Aggregate.hs+10−10
@@ -75,17 +75,17 @@ nonEmptyAgg (toColumns -> exprs) = fromColumns $
75 (pure exprs)
75 (pure exprs)
76
76
77
77
78−listAggWithOrder :: Table Expr b
78+listAggWithOrder :: Table Expr a
79− => (a -> o) -> (a -> b) -> Order o -> a -> Aggregate (ListTable b)
79+ => Order o -> o -> a -> Aggregate (ListTable a)
80−listAggWithOrder o b order a = fromColumns $
80+listAggWithOrder order o (toColumns -> exprs) = fromColumns $
81 hvectorize
81 hvectorize
82− (\_ (Identity (DB x)) -> Aggregation $ listAggExprWithOrder (o a) order x)
82+ (\_ (Identity (DB x)) -> Aggregation $ listAggExprWithOrder order o x)
83− (pure (toColumns (b a)))
83+ (pure exprs)
84
84
85
85
86−nonEmptyAggWithOrder :: Table Expr b
86+nonEmptyAggWithOrder :: Table Expr a
87− => (a -> o) -> (a -> b) -> Order o -> a -> Aggregate (NonEmptyTable b)
87+ => Order o -> o -> a -> Aggregate (NonEmptyTable a)
88−nonEmptyAggWithOrder o b order a = fromColumns $
88+nonEmptyAggWithOrder order o (toColumns -> exprs) = fromColumns $
89 hvectorize
89 hvectorize
90− (\_ (Identity (DB x)) -> Aggregation $ nonEmptyAggExprWithOrder (o a) order x)
90+ (\_ (Identity (DB x)) -> Aggregation $ nonEmptyAggExprWithOrder order o x)
91− (pure (toColumns (b a)))
91+ (pure exprs)