haskell/esqueleto
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

change coalesceDefault argument order

Browse Source
This commit is contained in:
Mitchell Rosen 2014-07-11 19:51:01 -07:00
parent e735378f90
commit 22f03c2e39
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Database/Esqueleto/Internal/Language.hs
View File

@ -263,7 +263,7 @@ class (Functor query, Applicative query, Monad query) =>
-- | Like @coalesce@, but takes a non-nullable expression -- | Like @coalesce@, but takes a non-nullable expression
-- placed at the end of the expression list, which guarantees -- placed at the end of the expression list, which guarantees
-- a non-NULL result. -- a non-NULL result.
coalesceDefault :: PersistField a => expr (Value a) -> [expr (Value (Maybe a))] -> expr (Value a) coalesceDefault :: PersistField a => [expr (Value (Maybe a))] -> expr (Value a) -> expr (Value a)
-- | @LIKE@ operator. -- | @LIKE@ operator.
like :: (PersistField s, IsString s) => expr (Value s) -> expr (Value s) -> expr (Value Bool) like :: (PersistField s, IsString s) => expr (Value s) -> expr (Value s) -> expr (Value Bool)

4
src/Database/Esqueleto/Internal/Sql.hs
View File

@ -373,8 +373,8 @@ instance Esqueleto SqlQuery SqlExpr SqlBackend where
min_ = unsafeSqlFunction "MIN" min_ = unsafeSqlFunction "MIN"
max_ = unsafeSqlFunction "MAX" max_ = unsafeSqlFunction "MAX"
coalesce = unsafeSqlFunction "COALESCE" coalesce = unsafeSqlFunction "COALESCE"
coalesceDefault def_expr exprs = unsafeSqlFunction "COALESCE" (exprs ++ [just def_expr]) coalesceDefault exprs = unsafeSqlFunction "COALESCE" . (exprs ++) . return . just
like = unsafeSqlBinOp " LIKE " like = unsafeSqlBinOp " LIKE "
(%) = unsafeSqlValue "'%'" (%) = unsafeSqlValue "'%'"

2
test/Test.hs
View File

@ -582,7 +582,7 @@ main = do
ret2 <- select $ ret2 <- select $
from $ \p -> do from $ \p -> do
orderBy [asc (p ^. PersonId)] orderBy [asc (p ^. PersonId)]
return (coalesceDefault (p ^. PersonFavNum) [p ^. PersonAge, p ^. PersonWeight]) return (coalesceDefault [p ^. PersonAge, p ^. PersonWeight] (p ^. PersonFavNum))
liftIO $ ret2 `shouldBe` [ Value (36 :: Int) liftIO $ ret2 `shouldBe` [ Value (36 :: Int)
, Value 37 , Value 37
, Value 17 , Value 17