Add instance of UnsafeSqlFunctionArgument ()

This commit is contained in:
parsonsmatt 2019-10-29 08:49:49 -06:00
parent c2ecf9c1a4
commit 55fec71ed4
4 changed files with 29 additions and 7 deletions

View File

@ -1,3 +1,10 @@
3.2.1
========
- @parsonsmatt
= [#159](https://github.com/bitemyapp/esqueleto/pull/159): Add an instance of `UnsafeSqlFunction ()` for 0-argument SQL
functions.
3.2.0 3.2.0
======== ========

View File

@ -1,7 +1,7 @@
cabal-version: 1.12 cabal-version: 1.12
name: esqueleto name: esqueleto
version: 3.2.0 version: 3.2.1
synopsis: Type-safe EDSL for SQL queries on persistent backends. synopsis: Type-safe EDSL for SQL queries on persistent backends.
description: @esqueleto@ is a bare bones, type-safe EDSL for SQL queries that works with unmodified @persistent@ SQL backends. Its language closely resembles SQL, so you don't have to learn new concepts, just new syntax, and it's fairly easy to predict the generated SQL and optimize it for your backend. Most kinds of errors committed when writing SQL are caught as compile-time errors---although it is possible to write type-checked @esqueleto@ queries that fail at runtime. description: @esqueleto@ is a bare bones, type-safe EDSL for SQL queries that works with unmodified @persistent@ SQL backends. Its language closely resembles SQL, so you don't have to learn new concepts, just new syntax, and it's fairly easy to predict the generated SQL and optimize it for your backend. Most kinds of errors committed when writing SQL are caught as compile-time errors---although it is possible to write type-checked @esqueleto@ queries that fail at runtime.
. .

View File

@ -1053,12 +1053,12 @@ instance FinalResult (Unique val) where
instance (FinalResult b) => FinalResult (a -> b) where instance (FinalResult b) => FinalResult (a -> b) where
finalR f = finalR (f undefined) finalR f = finalR (f undefined)
-- | Convert a constructor for a 'Unique' key on a record to the 'UniqueDef' that defines it. You -- | Convert a constructor for a 'Unique' key on a record to the 'UniqueDef' that defines it. You
-- can supply just the constructor itself, or a value of the type - the library is capable of figuring -- can supply just the constructor itself, or a value of the type - the library is capable of figuring
-- it out from there. -- it out from there.
-- --
-- @since 3.1.3 -- @since 3.1.3
toUniqueDef :: forall a val. (KnowResult a ~ (Unique val), PersistEntity val,FinalResult a) => toUniqueDef :: forall a val. (KnowResult a ~ (Unique val), PersistEntity val,FinalResult a) =>
a -> UniqueDef a -> UniqueDef
toUniqueDef uniqueConstructor = uniqueDef toUniqueDef uniqueConstructor = uniqueDef
where where
@ -1071,9 +1071,9 @@ toUniqueDef uniqueConstructor = uniqueDef
uniqueDef = head . filter filterF . entityUniques . entityDef $ proxy uniqueDef = head . filter filterF . entityUniques . entityDef $ proxy
-- | Render updates to be use in a SET clause for a given sql backend. -- | Render updates to be use in a SET clause for a given sql backend.
-- --
-- @since 3.1.3 -- @since 3.1.3
renderUpdates :: (BackendCompatible SqlBackend backend) => renderUpdates :: (BackendCompatible SqlBackend backend) =>
backend backend
-> [SqlExpr (Update val)] -> [SqlExpr (Update val)]
-> (TLB.Builder, [PersistValue]) -> (TLB.Builder, [PersistValue])
@ -2025,6 +2025,13 @@ unsafeSqlCastAs _ (ECompositeKey _) = throw (CompositeKeyErr SqlCastAsError)
class UnsafeSqlFunctionArgument a where class UnsafeSqlFunctionArgument a where
toArgList :: a -> [SqlExpr (Value ())] toArgList :: a -> [SqlExpr (Value ())]
-- | Useful for 0-argument functions, like @now@ in Postgresql.
--
-- @since 3.2.1
instance UnsafeSqlFunctionArgument () where
toArgList _ = []
instance (a ~ Value b) => UnsafeSqlFunctionArgument (SqlExpr a) where instance (a ~ Value b) => UnsafeSqlFunctionArgument (SqlExpr a) where
toArgList = (:[]) . veryUnsafeCoerceSqlExprValue toArgList = (:[]) . veryUnsafeCoerceSqlExprValue
instance UnsafeSqlFunctionArgument a => instance UnsafeSqlFunctionArgument a =>

View File

@ -25,7 +25,7 @@ import qualified Data.List as L
import Data.Ord (comparing) import Data.Ord (comparing)
import qualified Data.Text as T import qualified Data.Text as T
import qualified Data.Text.Encoding as TE import qualified Data.Text.Encoding as TE
import Data.Time.Clock (getCurrentTime, diffUTCTime) import Data.Time.Clock (getCurrentTime, diffUTCTime, UTCTime)
import Database.Esqueleto hiding (random_) import Database.Esqueleto hiding (random_)
import qualified Database.Esqueleto.Internal.Sql as ES import qualified Database.Esqueleto.Internal.Sql as ES
import Database.Esqueleto.PostgreSQL (random_) import Database.Esqueleto.PostgreSQL (random_)
@ -493,6 +493,14 @@ testPostgresModule = do
[Value (ret :: String)] <- select $ return (EP.chr (val 65)) [Value (ret :: String)] <- select $ return (EP.chr (val 65))
liftIO $ ret `shouldBe` "A" liftIO $ ret `shouldBe` "A"
it "allows unit for functions" $ do
vals <- run $ do
let
fn :: SqlExpr (Value UTCTime)
fn = ES.unsafeSqlFunction "now" ()
select $ pure fn
vals `shouldSatisfy` ((1 ==) . length)
it "works with now" $ it "works with now" $
run $ do run $ do
nowDb <- select $ return EP.now_ nowDb <- select $ return EP.now_