diff --git a/src/Rel8/Table/Opaleye.hs b/src/Rel8/Table/Opaleye.hs index 088adf8..6a41d90 100644 --- a/src/Rel8/Table/Opaleye.hs +++ b/src/Rel8/Table/Opaleye.hs @@ -35,8 +35,7 @@ import Data.Profunctor ( dimap, lmap ) import Rel8.Aggregate ( Aggregate( Aggregate ) ) import Rel8.Expr ( Expr, Col(..) ) import Rel8.Expr.Opaleye - ( scastExpr - , fromPrimExpr, toPrimExpr + ( fromPrimExpr, toPrimExpr , traversePrimExpr , fromColumn, toColumn ) @@ -94,14 +93,14 @@ tableFields (toColumns -> names) = dimap toColumns fromColumns $ name -> lmap (`hfield` field) (go specs name) where go :: SSpec spec -> Col Name spec -> Opaleye.TableFields (Col Insert spec) (Col Expr spec) - go SSpec {necessity, info} (NameCol name) = case necessity of + go SSpec {necessity} (NameCol name) = case necessity of SRequired -> lmap (\(RequiredInsert a) -> toColumn $ toPrimExpr a) $ - DB . scastExpr info . fromPrimExpr . fromColumn <$> + DB . fromPrimExpr . fromColumn <$> Opaleye.requiredTableField name SOptional -> lmap (\(OptionalInsert ma) -> toColumn . toPrimExpr <$> ma) $ - DB . scastExpr info . fromPrimExpr . fromColumn <$> + DB . fromPrimExpr . fromColumn <$> Opaleye.optionalTableField name