diff --git a/yesod-form/Yesod/Form/Fields.hs b/yesod-form/Yesod/Form/Fields.hs index b8109dfb..0689859f 100644 --- a/yesod-form/Yesod/Form/Fields.hs +++ b/yesod-form/Yesod/Form/Fields.hs @@ -64,8 +64,8 @@ import qualified Text.Email.Validate as Email import Data.Text.Encoding (encodeUtf8, decodeUtf8With) import Data.Text.Encoding.Error (lenientDecode) import Network.URI (parseURI) -import Database.Persist.Sql (PersistField, PersistFieldSql) -import Database.Persist (Entity (..)) +import Database.Persist.Sql (PersistField, PersistFieldSql (..)) +import Database.Persist (Entity (..), SqlType (SqlString)) import Text.HTML.SanitizeXSS (sanitizeBalance) import Control.Monad (when, unless) import Data.Maybe (listToMaybe, fromMaybe) @@ -168,7 +168,9 @@ $newline never -- | A newtype wrapper around a 'Text' that converts newlines to HTML -- br-tags. newtype Textarea = Textarea { unTextarea :: Text } - deriving (Show, Read, Eq, PersistField, PersistFieldSql, Ord) + deriving (Show, Read, Eq, PersistField, Ord) +instance PersistFieldSql Textarea where + sqlType _ = SqlString instance ToHtml Textarea where toHtml = unsafeByteString diff --git a/yesod-static/yesod-static.cabal b/yesod-static/yesod-static.cabal index 9db09b9c..5cdc2846 100644 --- a/yesod-static/yesod-static.cabal +++ b/yesod-static/yesod-static.cabal @@ -62,6 +62,7 @@ library other-modules: Yesod.EmbeddedStatic.Internal ghc-options: -Wall + extensions: TemplateHaskell test-suite tests hs-source-dirs: ., test @@ -105,6 +106,7 @@ test-suite tests , unordered-containers ghc-options: -Wall + extensions: TemplateHaskell source-repository head type: git