git.iko.soy/rel8
on master help sign in
s/fromTrool/coalesce/
commit3c5f54cfb69f23be8db2046fef30526b1b018aed authorShane O'Brien <shane.obrien@circuithub.com> dateTue 23 Mar 2021, 13:46 (6 years ago) parent93168af
3 files changed+11−11
compare with master
unifiedsplit
src/Rel8/Expr/Bool.hs+3−3 src/Rel8/Expr/Eq.hs+3−3 src/Rel8/Expr/Ord.hs+5−5
src/Rel8/Expr/Bool.hs+3−3
@@ -4,7 +4,7 @@ module Rel8.Expr.Bool
44 , and_, or_
55 , boolExpr
66 , caseExpr
7− , fromTrool
7+ , coalesce
88 )
99where
1010
@@ -62,7 +62,7 @@ caseExpr branches (Expr fallback) =
6262 go (Expr condition, Expr value) = (condition, value)
6363
6464
65−fromTrool :: Expr (Maybe Bool) -> Expr Bool
66−fromTrool (Expr a) = Expr a &&. Expr (Opaleye.FunExpr "COALESCE" [a, untrue])
65+coalesce :: Expr (Maybe Bool) -> Expr Bool
66+coalesce (Expr a) = Expr a &&. Expr (Opaleye.FunExpr "COALESCE" [a, untrue])
6767 where
6868 untrue = Opaleye.ConstExpr (Opaleye.BoolLit False)
src/Rel8/Expr/Eq.hs+3−3
@@ -22,7 +22,7 @@ import qualified Opaleye.Internal.HaskellDB.PrimQuery as Opaleye
2222
2323-- rel8
2424import Rel8.Expr ( Expr )
25−import Rel8.Expr.Bool ( (&&.), (||.), false, or_, fromTrool )
25+import Rel8.Expr.Bool ( (&&.), (||.), false, or_, coalesce )
2626import Rel8.Expr.Null ( isNull, unsafeLiftOpNullable )
2727import Rel8.Expr.Opaleye
2828 ( unsafeFromPrimExpr, unsafeToPrimExpr
@@ -79,12 +79,12 @@ infix 4 /=.
7979
8080
8181(==?) :: DBEq a => Expr (Maybe a) -> Expr (Maybe a) -> Expr Bool
82−a ==? b = fromTrool $ unsafeLiftOpNullable eq a b
82+a ==? b = coalesce $ unsafeLiftOpNullable eq a b
8383infix 4 ==?
8484
8585
8686(/=?) :: DBEq a => Expr (Maybe a) -> Expr (Maybe a) -> Expr Bool
87−a /=? b = fromTrool $ unsafeLiftOpNullable ne a b
87+a /=? b = coalesce $ unsafeLiftOpNullable ne a b
8888infix 4 /=?
8989
9090
src/Rel8/Expr/Ord.hs+5−5
@@ -22,7 +22,7 @@ import qualified Opaleye.Internal.HaskellDB.PrimQuery as Opaleye
2222
2323-- rel8
2424import Rel8.Expr ( Expr( Expr ) )
25−import Rel8.Expr.Bool ( (&&.), (||.), fromTrool )
25+import Rel8.Expr.Bool ( (&&.), (||.), coalesce )
2626import Rel8.Expr.Null ( isNull, isNonNull, nullable, unsafeLiftOpNullable )
2727import Rel8.Expr.Opaleye ( unsafeZipPrimExprsWith )
2828import Rel8.Schema.Nullability
@@ -93,22 +93,22 @@ infix 4 >=.
9393
9494
9595(<?) :: DBOrd a => Expr (Maybe a) -> Expr (Maybe a) -> Expr Bool
96−a <? b = fromTrool $ unsafeLiftOpNullable lt a b
96+a <? b = coalesce $ unsafeLiftOpNullable lt a b
9797infix 4 <?
9898
9999
100100(<=?) :: DBOrd a => Expr (Maybe a) -> Expr (Maybe a) -> Expr Bool
101−a <=? b = fromTrool $ unsafeLiftOpNullable le a b
101+a <=? b = coalesce $ unsafeLiftOpNullable le a b
102102infix 4 <=?
103103
104104
105105(>?) :: DBOrd a => Expr (Maybe a) -> Expr (Maybe a) -> Expr Bool
106−a >? b = fromTrool $ unsafeLiftOpNullable gt a b
106+a >? b = coalesce $ unsafeLiftOpNullable gt a b
107107infix 4 >?
108108
109109
110110(>=?) :: DBOrd a => Expr (Maybe a) -> Expr (Maybe a) -> Expr Bool
111−a >=? b = fromTrool $ unsafeLiftOpNullable ge a b
111+a >=? b = coalesce $ unsafeLiftOpNullable ge a b
112112infix 4 >=?
113113
114114