From 39bc7115635300fd4eb958281d8f347f6d1dae66 Mon Sep 17 00:00:00 2001 From: Felipe Lessa Date: Wed, 15 Jul 2015 14:19:46 -0300 Subject: [PATCH] Move lower_ around. --- src/Database/Esqueleto/Internal/Language.hs | 3 ++- src/Database/Esqueleto/Internal/Sql.hs | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/Database/Esqueleto/Internal/Language.hs b/src/Database/Esqueleto/Internal/Language.hs index b0d5432..12c3af8 100644 --- a/src/Database/Esqueleto/Internal/Language.hs +++ b/src/Database/Esqueleto/Internal/Language.hs @@ -350,7 +350,6 @@ class (Functor query, Applicative query, Monad query) => min_ :: (PersistField a) => expr (Value a) -> expr (Value (Maybe a)) max_ :: (PersistField a) => expr (Value a) -> expr (Value (Maybe a)) avg_ :: (PersistField a, PersistField b) => expr (Value a) -> expr (Value (Maybe b)) - lower_ :: (PersistField a, IsString a) => expr (Value a) -> expr (Value a) -- | @COALESCE@ function. Evaluates the arguments in order and -- returns the value of the first non-NULL expression, or NULL @@ -368,6 +367,8 @@ class (Functor query, Applicative query, Monad query) => -- /Since: 1.4.3/ coalesceDefault :: PersistField a => [expr (Value (Maybe a))] -> expr (Value a) -> expr (Value a) + -- | @LOWER@ function. + lower_ :: (PersistField a, IsString a) => expr (Value a) -> expr (Value a) -- | @LIKE@ operator. like :: (PersistField s, IsString s) => expr (Value s) -> expr (Value s) -> expr (Value Bool) -- | @ILIKE@ operator (case-insensitive @LIKE@). diff --git a/src/Database/Esqueleto/Internal/Sql.hs b/src/Database/Esqueleto/Internal/Sql.hs index c52d4b9..3e186cc 100644 --- a/src/Database/Esqueleto/Internal/Sql.hs +++ b/src/Database/Esqueleto/Internal/Sql.hs @@ -475,11 +475,11 @@ instance Esqueleto SqlQuery SqlExpr SqlBackend where min_ = unsafeSqlFunction "MIN" max_ = unsafeSqlFunction "MAX" avg_ = unsafeSqlFunction "AVG" - lower_ = unsafeSqlFunction "LOWER" coalesce = unsafeSqlFunctionParens "COALESCE" coalesceDefault exprs = unsafeSqlFunctionParens "COALESCE" . (exprs ++) . return . just + lower_ = unsafeSqlFunction "LOWER" like = unsafeSqlBinOp " LIKE " ilike = unsafeSqlBinOp " ILIKE " (%) = unsafeSqlValue "'%'"