git.iko.soy/rel8
on master help sign in
Don't cast in tableFields
61ac6c7Shane O'Brien
src/Rel8/Table/Opaleye.hs+4−5
compare with master
unifiedsplit
@@ -35,8 +35,7 @@ import Data.Profunctor ( dimap, lmap )
35import Rel8.Aggregate ( Aggregate( Aggregate ) )
35import Rel8.Aggregate ( Aggregate( Aggregate ) )
36import Rel8.Expr ( Expr, Col(..) )
36import Rel8.Expr ( Expr, Col(..) )
37import Rel8.Expr.Opaleye
37import Rel8.Expr.Opaleye
38− ( scastExpr
39− , fromPrimExpr, toPrimExpr
38+ ( fromPrimExpr, toPrimExpr
40 , traversePrimExpr
39 , traversePrimExpr
41 , fromColumn, toColumn
40 , fromColumn, toColumn
42 )
41 )
@@ -94,14 +93,14 @@ tableFields (toColumns -> names) = dimap toColumns fromColumns $
94 name -> lmap (`hfield` field) (go specs name)
93 name -> lmap (`hfield` field) (go specs name)
95 where
94 where
96 go :: SSpec spec -> Col Name spec -> Opaleye.TableFields (Col Insert spec) (Col Expr spec)
95 go :: SSpec spec -> Col Name spec -> Opaleye.TableFields (Col Insert spec) (Col Expr spec)
97− go SSpec {necessity, info} (NameCol name) = case necessity of
96+ go SSpec {necessity} (NameCol name) = case necessity of
98 SRequired ->
97 SRequired ->
99 lmap (\(RequiredInsert a) -> toColumn $ toPrimExpr a) $
98 lmap (\(RequiredInsert a) -> toColumn $ toPrimExpr a) $
100− DB . scastExpr info . fromPrimExpr . fromColumn <$>
99+ DB . fromPrimExpr . fromColumn <$>
101 Opaleye.requiredTableField name
100 Opaleye.requiredTableField name
102 SOptional ->
101 SOptional ->
103 lmap (\(OptionalInsert ma) -> toColumn . toPrimExpr <$> ma) $
102 lmap (\(OptionalInsert ma) -> toColumn . toPrimExpr <$> ma) $
104− DB . scastExpr info . fromPrimExpr . fromColumn <$>
103+ DB . fromPrimExpr . fromColumn <$>
105 Opaleye.optionalTableField name
104 Opaleye.optionalTableField name
106
105
107
106