f6a9c96 · rel8 · git.iko.soy

git.iko.soy/rel8

Fix array1DAggExpr

commitf6a9c968e49f17c16880f74d5478bf4b22d5b2e3 authorShane O'Brien <shane.obrien@circuithub.com> dateThu 15 Apr 2021, 13:42 (6 years ago) parentba684c0

2 files changed+2−4

compare with master

unifiedsplit

src/Rel8.hs+1−1 src/Rel8/Expr/Aggregate.hs+1−3

src/Rel8.hs+1−1

@@ -228,8 +228,8 @@ module Rel8

228228 -- These need organizing, but are reachable from Rel8's documentation so we

229229 -- do need to export and document them.

230230 , Array1D

231− , Nullable

232231 , NotArray

232+ , Nullable

233233 , NotNull

234234 , HTable

235235 , Labelable

src/Rel8/Expr/Aggregate.hs+1−3

@@ -155,14 +155,12 @@ groupByExpr = unsafeMakeAggregate toPrimExpr fromPrimExpr Nothing

155155

156156-- | Collect expressions values as an array.

157157array1DAggExpr :: NotArray a => Expr a -> Aggregate (Expr (Array1D a))

158−array1DAggExpr = unsafeMakeAggregate toPrimExpr from $ Just

158+array1DAggExpr = unsafeMakeAggregate toPrimExpr fromPrimExpr $ Just

159159 Aggregator

160160 { operation = Opaleye.AggrArr

161161 , ordering = []

162162 , distinction = Opaleye.AggrAll

163163 }

164− where

165− from = fromPrimExpr . fromPrimArray

166164

167165

168166-- | Collect expressions values as a list.