git.iko.soy/rel8
on master help sign in
s/fromTrool/coalesce/
3c5f54cShane O'Brien
src/Rel8/Expr/Bool.hs+3−3
compare with master
unifiedsplit
@@ -4,7 +4,7 @@ module Rel8.Expr.Bool
4 , and_, or_
4 , and_, or_
5 , boolExpr
5 , boolExpr
6 , caseExpr
6 , caseExpr
7− , fromTrool
7+ , coalesce
8 )
8 )
9where
9where
10
10
@@ -62,7 +62,7 @@ caseExpr branches (Expr fallback) =
62 go (Expr condition, Expr value) = (condition, value)
62 go (Expr condition, Expr value) = (condition, value)
63
63
64
64
65−fromTrool :: Expr (Maybe Bool) -> Expr Bool
65+coalesce :: Expr (Maybe Bool) -> Expr Bool
66−fromTrool (Expr a) = Expr a &&. Expr (Opaleye.FunExpr "COALESCE" [a, untrue])
66+coalesce (Expr a) = Expr a &&. Expr (Opaleye.FunExpr "COALESCE" [a, untrue])
67 where
67 where
68 untrue = Opaleye.ConstExpr (Opaleye.BoolLit False)
68 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
22
22
23-- rel8
23-- rel8
24import Rel8.Expr ( Expr )
24import Rel8.Expr ( Expr )
25−import Rel8.Expr.Bool ( (&&.), (||.), false, or_, fromTrool )
25+import Rel8.Expr.Bool ( (&&.), (||.), false, or_, coalesce )
26import Rel8.Expr.Null ( isNull, unsafeLiftOpNullable )
26import Rel8.Expr.Null ( isNull, unsafeLiftOpNullable )
27import Rel8.Expr.Opaleye
27import Rel8.Expr.Opaleye
28 ( unsafeFromPrimExpr, unsafeToPrimExpr
28 ( unsafeFromPrimExpr, unsafeToPrimExpr
@@ -79,12 +79,12 @@ infix 4 /=.
79
79
80
80
81(==?) :: DBEq a => Expr (Maybe a) -> Expr (Maybe a) -> Expr Bool
81(==?) :: 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
83infix 4 ==?
83infix 4 ==?
84
84
85
85
86(/=?) :: DBEq a => Expr (Maybe a) -> Expr (Maybe a) -> Expr Bool
86(/=?) :: 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
88infix 4 /=?
88infix 4 /=?
89
89
90
90
src/Rel8/Expr/Ord.hs+5−5
@@ -22,7 +22,7 @@ import qualified Opaleye.Internal.HaskellDB.PrimQuery as Opaleye
22
22
23-- rel8
23-- rel8
24import Rel8.Expr ( Expr( Expr ) )
24import Rel8.Expr ( Expr( Expr ) )
25−import Rel8.Expr.Bool ( (&&.), (||.), fromTrool )
25+import Rel8.Expr.Bool ( (&&.), (||.), coalesce )
26import Rel8.Expr.Null ( isNull, isNonNull, nullable, unsafeLiftOpNullable )
26import Rel8.Expr.Null ( isNull, isNonNull, nullable, unsafeLiftOpNullable )
27import Rel8.Expr.Opaleye ( unsafeZipPrimExprsWith )
27import Rel8.Expr.Opaleye ( unsafeZipPrimExprsWith )
28import Rel8.Schema.Nullability
28import Rel8.Schema.Nullability
@@ -93,22 +93,22 @@ infix 4 >=.
93
93
94
94
95(<?) :: DBOrd a => Expr (Maybe a) -> Expr (Maybe a) -> Expr Bool
95(<?) :: 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
97infix 4 <?
97infix 4 <?
98
98
99
99
100(<=?) :: DBOrd a => Expr (Maybe a) -> Expr (Maybe a) -> Expr Bool
100(<=?) :: 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
102infix 4 <=?
102infix 4 <=?
103
103
104
104
105(>?) :: DBOrd a => Expr (Maybe a) -> Expr (Maybe a) -> Expr Bool
105(>?) :: 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
107infix 4 >?
107infix 4 >?
108
108
109
109
110(>=?) :: DBOrd a => Expr (Maybe a) -> Expr (Maybe a) -> Expr Bool
110(>=?) :: 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
112infix 4 >=?
112infix 4 >=?
113
113
114
114