git.iko.soy/rel8
on master help sign in
Fix array1DAggExpr
f6a9c96Shane O'Brien
src/Rel8.hs+1−1
compare with master
unifiedsplit
@@ -228,8 +228,8 @@ module Rel8
228 -- These need organizing, but are reachable from Rel8's documentation so we
228 -- These need organizing, but are reachable from Rel8's documentation so we
229 -- do need to export and document them.
229 -- do need to export and document them.
230 , Array1D
230 , Array1D
231− , Nullable
232 , NotArray
231 , NotArray
232+ , Nullable
233 , NotNull
233 , NotNull
234 , HTable
234 , HTable
235 , Labelable
235 , Labelable
src/Rel8/Expr/Aggregate.hs+1−3
@@ -155,14 +155,12 @@ groupByExpr = unsafeMakeAggregate toPrimExpr fromPrimExpr Nothing
155
155
156-- | Collect expressions values as an array.
156-- | Collect expressions values as an array.
157array1DAggExpr :: NotArray a => Expr a -> Aggregate (Expr (Array1D a))
157array1DAggExpr :: NotArray a => Expr a -> Aggregate (Expr (Array1D a))
158−array1DAggExpr = unsafeMakeAggregate toPrimExpr from $ Just
158+array1DAggExpr = unsafeMakeAggregate toPrimExpr fromPrimExpr $ Just
159 Aggregator
159 Aggregator
160 { operation = Opaleye.AggrArr
160 { operation = Opaleye.AggrArr
161 , ordering = []
161 , ordering = []
162 , distinction = Opaleye.AggrAll
162 , distinction = Opaleye.AggrAll
163 }
163 }
164− where
165− from = fromPrimExpr . fromPrimArray
166
164
167
165
168-- | Collect expressions values as a list.
166-- | Collect expressions values as a list.